From patchwork Fri Apr 26 17:12:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Grygorii Strashko X-Patchwork-Id: 162941 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp993794jan; Fri, 26 Apr 2019 10:14:54 -0700 (PDT) X-Google-Smtp-Source: APXvYqy8prqj46P2TR+TywKImJIY3ZoqRs+Dw9n2I2KLdpk+gPOfucS8ac8S8+T9VfOch5NC102A X-Received: by 2002:a62:ed05:: with SMTP id u5mr47133374pfh.63.1556298894806; Fri, 26 Apr 2019 10:14:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556298894; cv=none; d=google.com; s=arc-20160816; b=emo9V7J5rn0rk0kNzeePhYfQBRGgxPYlSINiJULsLprfYw8hj+0OyvJ0I4n5+7LFLB EEItke7dc+N+7/MqIXAtwHbTg/Q9CBVJr4TCRSeQZNwDVxkduOaNTKM9ZaDK05kqgMWt AyOqAZy7PssCd42butLZSnvydxOfvBilJv+spzSYPvdSKWqJX9eI1XzAEBMUjGM9WoIq n6gGEubEitKgJcWo4QlYplB90TXSHrjjx0wKZ05TPQKnsT17yaoJZREuccGdWri/4bQP QKO3umNkdE8+Q5qF8klkeiVliZ4G0fJAyHUMMo3EMJ+4YBc+4/ean999zQSQrp6XTCg7 6uow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=95yxaG9sedTBg4t8LtXgLgWbi9p7IkLXNVqsPK50T4g=; b=dtqXiOFbnsGGdcmAOqGmkUxOC8MT3fjRwqSUC2q0LPcHeNuB1JqxzrvgeLAnRNfNgT gi5Ezu5bw4eo4R8piXwagts3qxAV2ktoLTxdmDECLNZh+06Up2wgATSy8yAehuR7nO05 csi8hMbJ4BXMLkrpEkyyWlCOriRuUjJAXxOjB/Dzr3fKaZ6jxUw1gCjbujHnvfqsg6IW ed6/H1nlbbJqqBdF5amQlE+77L4vkVhX97jirhaYbt9abbtdivkYGgFlo70ACQMNmOqq iD3BJPYjYrQaeeTX/3qAXuQGjYZyP49qCtDFpsYo5AqnILZuy3zeYlqu1gH3wiatZMmu mkLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b="j1NIMlE/"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a4si12158747pgb.466.2019.04.26.10.14.54; Fri, 26 Apr 2019 10:14:54 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b="j1NIMlE/"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726769AbfDZRNI (ORCPT + 30 others); Fri, 26 Apr 2019 13:13:08 -0400 Received: from lelv0142.ext.ti.com ([198.47.23.249]:47752 "EHLO lelv0142.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726669AbfDZRNE (ORCPT ); Fri, 26 Apr 2019 13:13:04 -0400 Received: from fllv0034.itg.ti.com ([10.64.40.246]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id x3QHD0hW072452; Fri, 26 Apr 2019 12:13:00 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1556298780; bh=95yxaG9sedTBg4t8LtXgLgWbi9p7IkLXNVqsPK50T4g=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=j1NIMlE/pqwp5gjMO4pQ6bIiw6qZIBLjr+QP9Aghqw3hNFUXZsDmUQIjPuM80Zooq 8JE+Bu+dV2LxEg+iguDub/TrZfV9bLZ+ADhgvdho7e9j/zTUqGktxyx87dQt//piDI gzdtJgMitBnfeMrxkxqiBIAb4v2B9pKQYviafpF8= Received: from DLEE109.ent.ti.com (dlee109.ent.ti.com [157.170.170.41]) by fllv0034.itg.ti.com (8.15.2/8.15.2) with ESMTPS id x3QHD0QQ129818 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 26 Apr 2019 12:13:00 -0500 Received: from DLEE113.ent.ti.com (157.170.170.24) by DLEE109.ent.ti.com (157.170.170.41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5; Fri, 26 Apr 2019 12:13:00 -0500 Received: from fllv0039.itg.ti.com (10.64.41.19) by DLEE113.ent.ti.com (157.170.170.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1713.5 via Frontend Transport; Fri, 26 Apr 2019 12:13:00 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id x3QHCxm3113328; Fri, 26 Apr 2019 12:13:00 -0500 From: Grygorii Strashko To: , Ilias Apalodimas , "David S . Miller" , Ivan Khoronzhuk CC: Florian Fainelli , Andrew Lunn , Sekhar Nori , , , Murali Karicheri , Grygorii Strashko Subject: [PATCH net-next v2 08/20] net: ethernet: ti: cpsw: drop cpsw_tx_packet_submit() Date: Fri, 26 Apr 2019 20:12:30 +0300 Message-ID: <1556298762-8632-9-git-send-email-grygorii.strashko@ti.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1556298762-8632-1-git-send-email-grygorii.strashko@ti.com> References: <1556298762-8632-1-git-send-email-grygorii.strashko@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Drop unnecessary wrapper function cpsw_tx_packet_submit() which is used only in one place. Reviewed-by: Andrew Lunn Signed-off-by: Grygorii Strashko --- drivers/net/ethernet/ti/cpsw.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) -- 2.17.1 diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index ddc259c45481..4a26c72be0cc 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c @@ -1500,17 +1500,6 @@ static void cpsw_get_ethtool_stats(struct net_device *ndev, } } -static inline int cpsw_tx_packet_submit(struct cpsw_priv *priv, - struct sk_buff *skb, - struct cpdma_chan *txch) -{ - struct cpsw_common *cpsw = priv->cpsw; - - skb_tx_timestamp(skb); - return cpdma_chan_submit(txch, skb, skb->data, skb->len, - priv->emac_port + cpsw->data.dual_emac); -} - static inline void cpsw_add_dual_emac_def_ale_entries( struct cpsw_priv *priv, struct cpsw_slave *slave, u32 slave_port) @@ -2138,7 +2127,9 @@ static netdev_tx_t cpsw_ndo_start_xmit(struct sk_buff *skb, txch = cpsw->txv[q_idx].ch; txq = netdev_get_tx_queue(ndev, q_idx); - ret = cpsw_tx_packet_submit(priv, skb, txch); + skb_tx_timestamp(skb); + ret = cpdma_chan_submit(txch, skb, skb->data, skb->len, + priv->emac_port + cpsw->data.dual_emac); if (unlikely(ret != 0)) { cpsw_err(priv, tx_err, "desc submit failed\n"); goto fail;