net: atheros: Use dev_get_drvdata
Subsystems (3)
PATCH 1/1 net: atheros: Use dev_get_drvdata
Instead of using to_pci_dev + pci_get_drvdata,
use dev_get_drvdata to make code simpler.
--- drivers/net/ethernet/atheros/alx/main.c | 6 ++---- drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 8 +++----- drivers/net/ethernet/atheros/atlx/atl1.c | 8 +++----- 3 files changed, 8 insertions(+), 14 deletions(-)
drivers/net/ethernet/atheros/alx/main.c +2 -4
@@ -1879,8 +1879,7 @@ static void alx_remove(struct pci_dev *pdev)#ifdef CONFIG_PM_SLEEP static int alx_suspend (struct device *dev) { -struct pci_dev *pdev =to_pci_dev (dev); -struct alx_priv *alx =pci_get_drvdata (pdev); +struct alx_priv *alx =dev_get_drvdata (dev);if (!netif_running (alx->dev))return 0 ;
@@ -1891,8 +1890,7 @@ static int alx_suspend(struct device *dev)static int alx_resume (struct device *dev) { -struct pci_dev *pdev =to_pci_dev (dev); -struct alx_priv *alx =pci_get_drvdata (pdev); +struct alx_priv *alx =dev_get_drvdata (dev);struct alx_hw *hw = &alx->hw;int err;
drivers/net/ethernet/atheros/atl1c/atl1c_main.c +3 -5
@@ -2422,8 +2422,7 @@ static int atl1c_close(struct net_device *netdev)static int atl1c_suspend (struct device *dev) { -struct pci_dev *pdev =to_pci_dev (dev); -struct net_device *netdev =pci_get_drvdata (pdev); +struct net_device *netdev =dev_get_drvdata (dev);struct atl1c_adapter *adapter =netdev_priv (netdev);struct atl1c_hw *hw = &adapter->hw;u32 wufc = adapter->wol;
@@ -2437,7 +2436,7 @@ static int atl1c_suspend(struct device *dev)if (wufc)if (atl1c_phy_to_ps_link (hw) !=0 ) -dev_dbg (&pdev->dev,"phy power saving failed" ); +dev_dbg (dev,"phy power saving failed" );atl1c_power_saving (hw, wufc);
@@ -2447,8 +2446,7 @@ static int atl1c_suspend(struct device *dev)#ifdef CONFIG_PM_SLEEP static int atl1c_resume (struct device *dev) { -struct pci_dev *pdev =to_pci_dev (dev); -struct net_device *netdev =pci_get_drvdata (pdev); +struct net_device *netdev =dev_get_drvdata (dev);struct atl1c_adapter *adapter =netdev_priv (netdev);AT_WRITE_REG (&adapter->hw,REG_WOL_CTRL ,0 );
drivers/net/ethernet/atheros/atlx/atl1.c +3 -5
@@ -2754,8 +2754,7 @@ static int atl1_close(struct net_device *netdev)#ifdef CONFIG_PM_SLEEP static int atl1_suspend (struct device *dev) { -struct pci_dev *pdev =to_pci_dev (dev); -struct net_device *netdev =pci_get_drvdata (pdev); +struct net_device *netdev =dev_get_drvdata (dev);struct atl1_adapter *adapter =netdev_priv (netdev);struct atl1_hw *hw = &adapter->hw;u32 ctrl =0 ;
@@ -2780,7 +2779,7 @@ static int atl1_suspend(struct device *dev) val =atl1_get_speed_and_duplex (hw, &speed, &duplex);if (val) {if (netif_msg_ifdown (adapter)) -dev_printk (KERN_DEBUG , &pdev->dev, +dev_printk (KERN_DEBUG , dev,"error getting speed/duplex\n" ); goto disable_wol; }
@@ -2837,8 +2836,7 @@ static int atl1_suspend(struct device *dev)static int atl1_resume (struct device *dev) { -struct pci_dev *pdev =to_pci_dev (dev); -struct net_device *netdev =pci_get_drvdata (pdev); +struct net_device *netdev =dev_get_drvdata (dev);struct atl1_adapter *adapter =netdev_priv (netdev);iowrite32 (0 , adapter->hw.hw_addr +REG_WOL_CTRL );
Signature · 1 line
2.20.1
Quoted 2 lines · Chuhong Yuan
Instead of using
to_pci_dev+pci_get_drvdata,
usedev_get_drvdatato make code simpler.
unrelated trivia:
drivers/net/ethernet/atheros/atl1c/atl1c_main.c
Quoted 1 line
drivers/net/ethernet/atheros/atl1c/atl1c_main.c +0
-0
[]
Quoted 11 lines
drivers/net/ethernet/atheros/atl1c/atl1c_main.c +1
-2@@ -2422,8 +2422,7 @@ static int atl1c_close(struct net_device *netdev)static int atl1c_suspend (struct device *dev) { -struct pci_dev *pdev =to_pci_dev (dev); -struct net_device *netdev =pci_get_drvdata (pdev); +struct net_device *netdev =dev_get_drvdata (dev);struct atl1c_adapter *adapter =netdev_priv (netdev);struct atl1c_hw *hw = &adapter->hw;u32 wufc = adapter->wol;
drivers/net/ethernet/atheros/atl1c/atl1c_main.c static int atl1c_suspend(struct device *dev) · line 2439
Quoted 5 lines
drivers/net/ethernet/atheros/atl1c/atl1c_main.c +1
-1@@ -2437,7 +2436,7 @@ static int atl1c_suspend(struct device *dev)if (wufc)if (atl1c_phy_to_ps_link (hw) !=0 ) -dev_dbg (&pdev->dev,"phy power saving failed" ); +dev_dbg (dev,"phy power saving failed" );
These and similar uses could/should use netdev_dbg
netdev_dbg(netdev, "phy power saving failed\n");
with the terminating newline too
drivers/net/ethernet/atheros/atlx/atl1.c
Quoted 1 line
drivers/net/ethernet/atheros/atlx/atl1.c +0
-0
[]
drivers/net/ethernet/atheros/atlx/atl1.c static int atl1_suspend(struct device *dev) · line 2783
Quoted 7 lines
drivers/net/ethernet/atheros/atlx/atl1.c +1
-1@@ -2780,7 +2779,7 @@ static int atl1_suspend(struct device *dev) val =atl1_get_speed_and_duplex (hw, &speed, &duplex);if (val) {if (netif_msg_ifdown (adapter)) -dev_printk (KERN_DEBUG , &pdev->dev, +dev_printk (KERN_DEBUG , dev,"error getting speed/duplex\n" );
netdev_printk(KERN_DEBUG, netdev, etc...);
From: Chuhong Yuan <[email protected]>
Date: Tue, 23 Jul 2019 21:18:56 +0800
Quoted 4 lines
Instead of using
to_pci_dev+pci_get_drvdata,
usedev_get_drvdatato make code simpler.Signed-off-by Chuhong Yuan <[email protected]>
Applied.