[PATCH v3 05/13] net: ethernet: ti: cpsw: don't check slave num in runtime

Path	csiph.com!aioe.org!gothmog.csi.it!bofh.it!news.nic.it!robomod
From	Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org>
Newsgroups	linux.kernel
Subject	[PATCH v3 05/13] net: ethernet: ti: cpsw: don't check slave num in runtime
Date	Wed, 10 Aug 2016 01:30:01 +0200
Message-ID	<s4oD7-5EB-5@gated-at.bofh.it> (permalink)
References	<s4oD7-5EB-7@gated-at.bofh.it>
X-Original-To	netdev@vger.kernel.org, mugunthanvnm@ti.com, grygorii.strashko@ti.com
Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=aoNZ/lL1hX2vIaskFQvl+4uyBRaf/qDjlTBOzdKb5BE=; b=E6QV89YdxpI5h4h06kSz2NYXCL8meX0nCnb0ZaLl+P6uTVTW0OnVNmA1qy724ObxXN G/lJrTODGSg2k9mNYnHO7GjfSifDS6gSgnjRCX+LZmYRKAO1xaNAmxvbGjXBkx++cVa6 Cjt2Na/OL+0jzj+sok53nEt+9ZTvvxKNAEo4Q=
X-Google-Dkim-Signature	v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=aoNZ/lL1hX2vIaskFQvl+4uyBRaf/qDjlTBOzdKb5BE=; b=FrPXDWWre9qUAY7/e9aI9HpOwhVd3XRn9Fodm3Q93qO+SSTld4bFgoRnMY76XmajUZ RyVSppPI9xIkrLNgGKr8P9Mt+TFWSgcjlxuhAxjHne72cPALWOoOK+DR986fnBYGk+t0 hDFjxfWhvL0zPP4YPqtt+enHt7VsprO8DaUoYbmQdoDL+XV24qOSGMFIf5aIjYBe5HBJ kRQZ+JHrnztoEst/tk8Drao3Oke/yjnDdoFnswz7b5CcJZl1cX4oUEeEPDhon4Y/x8di R/GClw0UBZGMClGRq8EaXd7PnVMuG+AqvujUerzoudb6uFrFwEb5YQ+zFf9hxkSMU3Eh lMmg==
X-Gm-Message-State	AEkoouu8hfMz6H6j7TDBfmaSqAXiGE1n6OwK1tzMqbYxo7JVS9HN4+IZtybinymb1qP2oLXJ
X-Received	by 10.25.1.133 with SMTP id 127mr150927lfb.54.1470785008892; Tue, 09 Aug 2016 16:23:28 -0700 (PDT)
X-Mailer	git-send-email 1.9.1
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	58
Organization	linux.* mail to news gateway
X-Original-Cc	linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org, dlide@ti.com, Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org>
X-Original-Date	Wed, 10 Aug 2016 02:22:36 +0300
X-Original-Message-ID	<1470784964-26440-6-git-send-email-ivan.khoronzhuk@linaro.org>
X-Original-References	<1470784964-26440-1-git-send-email-ivan.khoronzhuk@linaro.org>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1459176

Show key headers only | View raw

No need to check const slave num in runtime for every packet,
and ndev for slaves w/o ndev is anyway NULL. So remove redundant
check and macro.

Reviewed-by: Mugunthan V N <mugunthanvnm@ti.com>
Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org>
---
 drivers/net/ethernet/ti/cpsw.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
index 0b6958d..cfbb1f2 100644
--- a/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c
@@ -497,9 +497,6 @@ static const struct cpsw_stats cpsw_gstrings_stats[] = {
 					n; n--)				\
 				(func)(slave++, ##arg);			\
 	} while (0)
-#define cpsw_get_slave_ndev(priv, __slave_no__)				\
-	((__slave_no__ < priv->data.slaves) ?				\
-		priv->slaves[__slave_no__].ndev : NULL)
 #define cpsw_get_slave_priv(priv, __slave_no__)				\
 	(((__slave_no__ < priv->data.slaves) &&				\
 		(priv->slaves[__slave_no__].ndev)) ?			\
@@ -510,11 +507,11 @@ static const struct cpsw_stats cpsw_gstrings_stats[] = {
 		if (!priv->data.dual_emac)				\
 			break;						\
 		if (CPDMA_RX_SOURCE_PORT(status) == 1) {		\
-			ndev = cpsw_get_slave_ndev(priv, 0);		\
+			ndev = priv->slaves[0].ndev;			\
 			priv = netdev_priv(ndev);			\
 			skb->dev = ndev;				\
 		} else if (CPDMA_RX_SOURCE_PORT(status) == 2) {		\
-			ndev = cpsw_get_slave_ndev(priv, 1);		\
+			ndev = priv->slaves[1].ndev;			\
 			priv = netdev_priv(ndev);			\
 			skb->dev = ndev;				\
 		}							\
@@ -2561,7 +2558,7 @@ static int cpsw_remove(struct platform_device *pdev)
 	}
 
 	if (priv->data.dual_emac)
-		unregister_netdev(cpsw_get_slave_ndev(priv, 1));
+		unregister_netdev(priv->slaves[1].ndev);
 	unregister_netdev(ndev);
 
 	cpsw_ale_destroy(priv->ale);
@@ -2570,7 +2567,7 @@ static int cpsw_remove(struct platform_device *pdev)
 	pm_runtime_put_sync(&pdev->dev);
 	pm_runtime_disable(&pdev->dev);
 	if (priv->data.dual_emac)
-		free_netdev(cpsw_get_slave_ndev(priv, 1));
+		free_netdev(priv->slaves[1].ndev);
 	free_netdev(ndev);
 	return 0;
 }
-- 
1.9.1

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH v3 05/13] net: ethernet: ti: cpsw: don't check slave num in runtime Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org> - 2016-08-10 01:30 +0200

csiph-web