All of lore.kernel.org
 help / color / mirror / Atom feed
From: Grygorii Strashko <grygorii.strashko@ti.com>
To: <netdev@vger.kernel.org>,
	Ilias Apalodimas <ilias.apalodimas@linaro.org>,
	"David S . Miller" <davem@davemloft.net>,
	Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org>
Cc: Florian Fainelli <f.fainelli@gmail.com>,
	Andrew Lunn <andrew@lunn.ch>, Sekhar Nori <nsekhar@ti.com>,
	<linux-kernel@vger.kernel.org>, <linux-omap@vger.kernel.org>,
	Murali Karicheri <m-karicheri2@ti.com>,
	Grygorii Strashko <grygorii.strashko@ti.com>
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	[thread overview]
Message-ID: <1556298762-8632-9-git-send-email-grygorii.strashko@ti.com> (raw)
In-Reply-To: <1556298762-8632-1-git-send-email-grygorii.strashko@ti.com>

Drop unnecessary wrapper function cpsw_tx_packet_submit() which is used
only in one place.

Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
---
 drivers/net/ethernet/ti/cpsw.c | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

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;
-- 
2.17.1


WARNING: multiple messages have this Message-ID (diff)
From: Grygorii Strashko <grygorii.strashko@ti.com>
To: netdev@vger.kernel.org,
	Ilias Apalodimas <ilias.apalodimas@linaro.org>,
	"David S . Miller" <davem@davemloft.net>,
	Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org>
Cc: Florian Fainelli <f.fainelli@gmail.com>,
	Andrew Lunn <andrew@lunn.ch>, Sekhar Nori <nsekhar@ti.com>,
	linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org,
	Murali Karicheri <m-karicheri2@ti.com>,
	Grygorii Strashko <grygorii.strashko@ti.com>
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	[thread overview]
Message-ID: <1556298762-8632-9-git-send-email-grygorii.strashko@ti.com> (raw)
In-Reply-To: <1556298762-8632-1-git-send-email-grygorii.strashko@ti.com>

Drop unnecessary wrapper function cpsw_tx_packet_submit() which is used
only in one place.

Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
---
 drivers/net/ethernet/ti/cpsw.c | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

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;
-- 
2.17.1

  parent reply	other threads:[~2019-04-26 17:14 UTC|newest]

Thread overview: 52+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-26 17:12 [PATCH net-next v2 00/20] net: ethernet: ti: clean up and optimizations Grygorii Strashko
2019-04-26 17:12 ` Grygorii Strashko
2019-04-26 17:12 ` [PATCH net-next v2 01/20] net: ethernet: ti: convert to SPDX license identifiers Grygorii Strashko
2019-04-26 17:12   ` Grygorii Strashko
2019-04-26 22:04   ` Andrew Lunn
2019-04-26 17:12 ` [PATCH net-next v2 02/20] net: ethernet: ti: cpsw: drop TI_DAVINCI_CPDMA config option Grygorii Strashko
2019-04-26 17:12   ` Grygorii Strashko
2019-04-26 22:06   ` Andrew Lunn
2019-04-26 17:12 ` [PATCH net-next v2 03/20] net: ethernet: ti: cpsw: drop CONFIG_TI_CPSW_ALE " Grygorii Strashko
2019-04-26 17:12   ` Grygorii Strashko
2019-04-26 22:08   ` Andrew Lunn
2019-04-26 17:12 ` [PATCH net-next v2 04/20] net: ethernet: ti: cpsw: update cpsw_split_res() to accept cpsw_common Grygorii Strashko
2019-04-26 17:12   ` Grygorii Strashko
2019-04-26 22:09   ` Andrew Lunn
2019-04-26 17:12 ` [PATCH net-next v2 05/20] net: ethernet: ti: cpsw: use local var dev in probe Grygorii Strashko
2019-04-26 17:12   ` Grygorii Strashko
2019-04-26 22:10   ` Andrew Lunn
2019-04-26 17:12 ` [PATCH net-next v2 06/20] net: ethernet: ti: cpsw: drop pinctrl_pm_select_default_state call Grygorii Strashko
2019-04-26 17:12   ` Grygorii Strashko
2019-04-26 17:12 ` [PATCH net-next v2 07/20] net: ethernet: ti: cpsw: use devm_alloc_etherdev_mqs() Grygorii Strashko
2019-04-26 17:12   ` Grygorii Strashko
2019-04-26 17:12 ` Grygorii Strashko [this message]
2019-04-26 17:12   ` [PATCH net-next v2 08/20] net: ethernet: ti: cpsw: drop cpsw_tx_packet_submit() Grygorii Strashko
2019-04-26 17:12 ` [PATCH net-next v2 09/20] net: ethernet: ti: ale: fix mcast super setting Grygorii Strashko
2019-04-26 17:12   ` Grygorii Strashko
2019-04-26 17:12 ` [PATCH net-next v2 10/20] net: ethernet: ti: ale: use define for host port in cpsw_ale_set_allmulti() Grygorii Strashko
2019-04-26 17:12   ` Grygorii Strashko
2019-04-26 17:12 ` [PATCH net-next v2 11/20] net: ethernet: ti: cpsw: fix allmulti cfg in dual_mac mode Grygorii Strashko
2019-04-26 17:12   ` Grygorii Strashko
2019-04-26 17:12 ` [PATCH net-next v2 12/20] net: ethernet: ti: ale: do not auto delete mcast super entries Grygorii Strashko
2019-04-26 17:12   ` Grygorii Strashko
2019-04-26 17:12 ` [PATCH net-next v2 13/20] net: ethernet: ti: davinci_mdio: use devm_ioremap() Grygorii Strashko
2019-04-26 17:12   ` Grygorii Strashko
2019-04-26 22:12   ` Andrew Lunn
2019-04-26 17:12 ` [PATCH net-next v2 14/20] net: ethernet: ti: cpsw: refactor probe to group common hw initialization Grygorii Strashko
2019-04-26 17:12   ` Grygorii Strashko
2019-04-26 17:12 ` [PATCH net-next v2 15/20] net: ethernet: ti: cpsw: move cpsw definitions in priv header Grygorii Strashko
2019-04-26 17:12   ` Grygorii Strashko
2019-04-26 17:12 ` [PATCH net-next v2 16/20] net: ethernet: ti: davinci_cpdma: use dma_addr_t for desc_mem_phys and desc_hw_addr Grygorii Strashko
2019-04-26 17:12   ` Grygorii Strashko
2019-04-26 17:12 ` [PATCH net-next v2 17/20] net: ethernet: ti: cpsw: move common hw init code in separate func Grygorii Strashko
2019-04-26 17:12   ` Grygorii Strashko
2019-04-26 17:12 ` [PATCH net-next v2 18/20] net: ethernet: ti: cpsw: introduce mac sl module api Grygorii Strashko
2019-04-26 17:12   ` Grygorii Strashko
2019-04-26 17:12 ` [PATCH net-next v2 19/20] net: ethernet: ti: cpsw: switch to use mac sl api Grygorii Strashko
2019-04-26 17:12   ` Grygorii Strashko
2019-04-26 17:12 ` [PATCH net-next v2 20/20] net: ethernet: ti: cpsw: move ethtool func in separate file Grygorii Strashko
2019-04-26 17:12   ` Grygorii Strashko
2019-04-26 22:16   ` Andrew Lunn
2019-04-26 21:20 ` [PATCH net-next v2 00/20] net: ethernet: ti: clean up and optimizations Jakub Kicinski
2019-04-26 21:20   ` Jakub Kicinski
2019-04-27 21:12 ` David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1556298762-8632-9-git-send-email-grygorii.strashko@ti.com \
    --to=grygorii.strashko@ti.com \
    --cc=andrew@lunn.ch \
    --cc=davem@davemloft.net \
    --cc=f.fainelli@gmail.com \
    --cc=ilias.apalodimas@linaro.org \
    --cc=ivan.khoronzhuk@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=m-karicheri2@ti.com \
    --cc=netdev@vger.kernel.org \
    --cc=nsekhar@ti.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.