Skip to contentSkip to conversation

atheros/atlx: use SET_ETHTOOL_OPS directly

PATCH Applied Wang Weidong 2 participants 6 messages Mar 19, 2014 – Mar 21, 2014

Subsystems (3)
Networking Network drivers Atlx Ethernet drivers
lore
Share & tools
lore

Wang Weidong

author
#0 lore raw

PATCH 1/1 atheros/atlx: use SET_ETHTOOL_OPS directly

As commit a6e28b34205b("staging/et131x: use SET_ETHTOOL_OPS directly"), using a wrapper around SET_ETHTOOL_OPS macro is not actually required, remove and use SET_ETHTOOL_OPS directly.

Signed-off-by Wang Weidong <[email protected]>
---
 drivers/net/ethernet/atheros/atlx/atl2.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)
drivers/net/ethernet/atheros/atlx/atl2.c +1 -8
index 265ce1b..9262521 100644
@@ -71,8 +71,6 @@ static DEFINE_PCI_DEVICE_TABLE(atl2_pci_tbl) = {
 };
 MODULE_DEVICE_TABLE(pci, atl2_pci_tbl);
 
-static void atl2_set_ethtool_ops(struct net_device *netdev);
-
 static void atl2_check_options(struct atl2_adapter *adapter);
 
 /**

@@ -1397,7 +1395,7 @@ static int atl2_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 	atl2_setup_pcicmd(pdev);
 
 	netdev->netdev_ops = &atl2_netdev_ops;
-	atl2_set_ethtool_ops(netdev);
+	SET_ETHTOOL_OPS(netdev, &atl2_ethtool_ops);
 	netdev->watchdog_timeo = 5 * HZ;
 	strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1);
 

@@ -2105,11 +2103,6 @@ static const struct ethtool_ops atl2_ethtool_ops = {
 	.set_eeprom		= atl2_set_eeprom,
 };
 
-static void atl2_set_ethtool_ops(struct net_device *netdev)
-{
-	SET_ETHTOOL_OPS(netdev, &atl2_ethtool_ops);
-}
-
 #define LBYTESWAP(a)  ((((a) & 0x00ff00ff) << 8) | \
 	(((a) & 0xff00ff00) >> 8))
 #define LONGSWAP(a)   ((LBYTESWAP(a) << 16) | (LBYTESWAP(a) >> 16))
Signature · 1 line
1.7.12
maintainer Applied
#1 lore raw

From: Wang Weidong <[email protected]>
Date: Wed, 19 Mar 2014 17:39:15 +0800

Quoted 5 lines

As commit a6e28b34205b("staging/et131x: use SET_ETHTOOL_OPS directly"), using a wrapper around SET_ETHTOOL_OPS macro is not actually required, remove and use SET_ETHTOOL_OPS directly.

Signed-off-by Wang Weidong <[email protected]>

Applied, thank you.

maintainer
#2 lore raw

From: David Miller <[email protected]>
Date: Thu, 20 Mar 2014 16:07:01 -0400 (EDT)

Quoted 10 lines

From: Wang Weidong <[email protected]>
Date: Wed, 19 Mar 2014 17:39:15 +0800

Quoted 5 lines

As commit a6e28b34205b("staging/et131x: use SET_ETHTOOL_OPS directly"), using a wrapper around SET_ETHTOOL_OPS macro is not actually required, remove and use SET_ETHTOOL_OPS directly.

Signed-off-by Wang Weidong <[email protected]>

Applied, thank you.

I reverted, you did not ever build test this:

drivers/net/ethernet/atheros/atlx/atl2.c: In function ‘atl2_probe’:
drivers/net/ethernet/atheros/atlx/atl2.c:1398:2: error: ‘atl2_ethtool_ops’ undeclared (first use in this function) drivers/net/ethernet/atheros/atlx/atl2.c:1398:2: note: each undeclared identifier is reported only once for each function it appears in make[1]: *** [drivers/net/ethernet/atheros/atlx/atl2.o] Error 1
make: *** [drivers/net/ethernet/atheros/atlx/atl2.o] Error 2

If you do not even have the time to do a test build, then I do not have the time to review and apply your patches.

author
#3 lore raw
Quoted 16 lines · David Miller

From: David Miller <[email protected]>
Date: Thu, 20 Mar 2014 16:07:01 -0400 (EDT)

Quoted 10 lines

From: Wang Weidong <[email protected]>
Date: Wed, 19 Mar 2014 17:39:15 +0800

Quoted 5 lines

As commit a6e28b34205b("staging/et131x: use SET_ETHTOOL_OPS directly"), using a wrapper around SET_ETHTOOL_OPS macro is not actually required, remove and use SET_ETHTOOL_OPS directly.

Signed-off-by Wang Weidong <[email protected]>

Applied, thank you.

I reverted, you did not ever build test this:

Quoted 9 lines

drivers/net/ethernet/atheros/atlx/atl2.c: In function ‘atl2_probe’:
drivers/net/ethernet/atheros/atlx/atl2.c:1398:2: error: ‘atl2_ethtool_ops’ undeclared (first use in this function) drivers/net/ethernet/atheros/atlx/atl2.c:1398:2: note: each undeclared identifier is reported only once for each function it appears in make[1]: *** [drivers/net/ethernet/atheros/atlx/atl2.o] Error 1
make: *** [drivers/net/ethernet/atheros/atlx/atl2.o] Error 2

If you do not even have the time to do a test build, then I do not have the time to review and apply your patches.

Hi David,

So sorry for your time. I built all the kernel at first time, and this error log was hidden, although, I should build it in the drivers/ and ensured it OK, It is my mistake.

I will fix it.

Regards
Wang

author
#4 lore raw

PATCH v2 1/1 atheros/atlx: use SET_ETHTOOL_OPS directly

In reply to Wang Weidong

As commit a6e28b34205b("staging/et131x: use SET_ETHTOOL_OPS directly"), using a wrapper around SET_ETHTOOL_OPS macro is not actually required, remove and use SET_ETHTOOL_OPS directly.

Signed-off-by Wang Weidong <[email protected]>

---
Change note:

v2: fix the build error.

---
 drivers/net/ethernet/atheros/atlx/atl2.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)
drivers/net/ethernet/atheros/atlx/atl2.c +2 -8
index 265ce1b..78befb5 100644
@@ -55,6 +55,7 @@ static const char atl2_driver_name[] = "atl2";
 static const char atl2_driver_string[] = "Atheros(R) L2 Ethernet Driver";
 static const char atl2_copyright[] = "Copyright (c) 2007 Atheros Corporation.";
 static const char atl2_driver_version[] = ATL2_DRV_VERSION;
+static const struct ethtool_ops atl2_ethtool_ops;
 
 MODULE_AUTHOR("Atheros Corporation <[email protected]>, Chris Snook <[email protected]>");
 MODULE_DESCRIPTION("Atheros Fast Ethernet Network Driver");

@@ -71,8 +72,6 @@ static DEFINE_PCI_DEVICE_TABLE(atl2_pci_tbl) = {
 };
 MODULE_DEVICE_TABLE(pci, atl2_pci_tbl);
 
-static void atl2_set_ethtool_ops(struct net_device *netdev);
-
 static void atl2_check_options(struct atl2_adapter *adapter);
 
 /**

@@ -1397,7 +1396,7 @@ static int atl2_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 	atl2_setup_pcicmd(pdev);
 
 	netdev->netdev_ops = &atl2_netdev_ops;
-	atl2_set_ethtool_ops(netdev);
+	SET_ETHTOOL_OPS(netdev, &atl2_ethtool_ops);
 	netdev->watchdog_timeo = 5 * HZ;
 	strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1);
 

@@ -2105,11 +2104,6 @@ static const struct ethtool_ops atl2_ethtool_ops = {
 	.set_eeprom		= atl2_set_eeprom,
 };
 
-static void atl2_set_ethtool_ops(struct net_device *netdev)
-{
-	SET_ETHTOOL_OPS(netdev, &atl2_ethtool_ops);
-}
-
 #define LBYTESWAP(a)  ((((a) & 0x00ff00ff) << 8) | \
 	(((a) & 0xff00ff00) >> 8))
 #define LONGSWAP(a)   ((LBYTESWAP(a) << 16) | (LBYTESWAP(a) >> 16))
Signature · 1 line
1.7.12
maintainer Applied
#5 lore raw

From: Wang Weidong <[email protected]>
Date: Fri, 21 Mar 2014 09:50:43 +0800

Quoted 5 lines

As commit a6e28b34205b("staging/et131x: use SET_ETHTOOL_OPS directly"), using a wrapper around SET_ETHTOOL_OPS macro is not actually required, remove and use SET_ETHTOOL_OPS directly.

Signed-off-by Wang Weidong <[email protected]>

Applied.