[PATCH net-next 6/6] r8169: change argument type of rtl8169_net_suspend and __rtl8169_resume

[Heiner Kallweit]

Both functions can be simplified by changing the argument type to
struct rtl8169_private *.

Signed-off-by: Heiner Kallweit <hkallwe...@gmail.com>
---
 drivers/net/ethernet/realtek/r8169.c | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/drivers/net/ethernet/realtek/r8169.c 
b/drivers/net/ethernet/realtek/r8169.c
index dd84cc3a..58d84e48 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -7776,15 +7776,13 @@ rtl8169_get_stats64(struct net_device *dev, struct 
rtnl_link_stats64 *stats)
        pm_runtime_put_noidle(&pdev->dev);
 }
 
-static void rtl8169_net_suspend(struct net_device *dev)
+static void rtl8169_net_suspend(struct rtl8169_private *tp)
 {
-       struct rtl8169_private *tp = netdev_priv(dev);
-
-       if (!netif_running(dev))
+       if (!netif_running(tp->dev))
                return;
 
-       netif_device_detach(dev);
-       netif_stop_queue(dev);
+       netif_device_detach(tp->dev);
+       netif_stop_queue(tp->dev);
 
        rtl_lock_work(tp);
        napi_disable(&tp->napi);
@@ -7800,16 +7798,14 @@ static int rtl8169_suspend(struct device *device)
 {
        struct rtl8169_private *tp = dev_get_drvdata(device);
 
-       rtl8169_net_suspend(tp->dev);
+       rtl8169_net_suspend(tp);
 
        return 0;
 }
 
-static void __rtl8169_resume(struct net_device *dev)
+static void __rtl8169_resume(struct rtl8169_private *tp)
 {
-       struct rtl8169_private *tp = netdev_priv(dev);
-
-       netif_device_attach(dev);
+       netif_device_attach(tp->dev);
 
        rtl_pll_power_up(tp);
 
@@ -7828,7 +7824,7 @@ static int rtl8169_resume(struct device *device)
        rtl8169_init_phy(tp);
 
        if (netif_running(tp->dev))
-               __rtl8169_resume(tp->dev);
+               __rtl8169_resume(tp);
 
        return 0;
 }
@@ -7847,7 +7843,7 @@ static int rtl8169_runtime_suspend(struct device *device)
        __rtl8169_set_wol(tp, WAKE_ANY);
        rtl_unlock_work(tp);
 
-       rtl8169_net_suspend(tp->dev);
+       rtl8169_net_suspend(tp);
 
        /* Update counters before going runtime suspend */
        rtl8169_rx_missed(tp->dev);
@@ -7872,7 +7868,7 @@ static int rtl8169_runtime_resume(struct device *device)
 
        rtl8169_init_phy(tp);
 
-       __rtl8169_resume(tp->dev);
+       __rtl8169_resume(tp);
 
        return 0;
 }
@@ -7929,7 +7925,7 @@ static void rtl_shutdown(struct pci_dev *pdev)
 {
        struct rtl8169_private *tp = pci_get_drvdata(pdev);
 
-       rtl8169_net_suspend(tp->dev);
+       rtl8169_net_suspend(tp);
 
        /* Restore original MAC address */
        rtl_rar_set(tp, tp->dev->perm_addr);
-- 
2.16.2