net: atheros: Use dev_get_drvdata

Instead of using to_pci_dev + pci_get_drvdata,
use dev_get_drvdata to make code simpler.

Signed-off-by: Chuhong Yuan <hslester96@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/atheros/alx/main.c b/drivers/net/ethernet/atheros/alx/main.c
index a3ec738da336df46154619cae8caca0344eca0ca..d4bbcdfd691afd6ba591a72a466f7886c929af05 100644 (file)
--- a/drivers/net/ethernet/atheros/alx/main.c
+++ b/drivers/net/ethernet/atheros/alx/main.c
@@ -1877,8 +1877,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;
@@ -1889,8 +1888,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;
 

diff --git a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
index 179ad62a2bd21ed7a91f1c4659aae2aa72673cbb..2b239ecea05f2b770738140391a6388d4a397daa 100644 (file)
--- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
+++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
@@ -2420,8 +2420,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;
@@ -2435,7 +2434,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);
 
@@ -2445,8 +2444,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);

diff --git a/drivers/net/ethernet/atheros/atlx/atl1.c b/drivers/net/ethernet/atheros/atlx/atl1.c
index 5f420c17bf3e3d342dfba7ff5f6d816836514925..b498fd6a47d0b0c7004565978b18e39fca8ad929 100644 (file)
--- a/drivers/net/ethernet/atheros/atlx/atl1.c
+++ b/drivers/net/ethernet/atheros/atlx/atl1.c
@@ -2753,8 +2753,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;
@@ -2779,7 +2778,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;
                }
@@ -2836,8 +2835,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);