From mboxrd@z Thu Jan 1 00:00:00 1970 From: Heiner Kallweit Subject: [PATCH net-next 5/6] r8169: change type of driver_data Date: Sat, 24 Mar 2018 23:18:25 +0100 Message-ID: <70541d5c-7a5e-3988-585d-2804ab41e4db@gmail.com> References: <6160c32d-3905-683a-7117-d2b11d310a34@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Cc: "netdev@vger.kernel.org" To: Realtek linux nic maintainers , David Miller Return-path: Received: from mail-wr0-f193.google.com ([209.85.128.193]:35620 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752457AbeCXWSo (ORCPT ); Sat, 24 Mar 2018 18:18:44 -0400 Received: by mail-wr0-f193.google.com with SMTP id 80so14275424wrb.2 for ; Sat, 24 Mar 2018 15:18:43 -0700 (PDT) In-Reply-To: <6160c32d-3905-683a-7117-d2b11d310a34@gmail.com> Sender: netdev-owner@vger.kernel.org List-ID: Several functions accessing the device driver_data field don't need the net_device. All needed parameters can be accessed via struct rtl8169_private, therefore change type of driver_data accordingly. Signed-off-by: Heiner Kallweit --- drivers/net/ethernet/realtek/r8169.c | 51 +++++++++++++++--------------------- 1 file changed, 21 insertions(+), 30 deletions(-) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 2d68306e..dd84cc3a 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -7798,10 +7798,9 @@ static void rtl8169_net_suspend(struct net_device *dev) static int rtl8169_suspend(struct device *device) { - struct pci_dev *pdev = to_pci_dev(device); - struct net_device *dev = pci_get_drvdata(pdev); + struct rtl8169_private *tp = dev_get_drvdata(device); - rtl8169_net_suspend(dev); + rtl8169_net_suspend(tp->dev); return 0; } @@ -7824,23 +7823,19 @@ static void __rtl8169_resume(struct net_device *dev) static int rtl8169_resume(struct device *device) { - struct pci_dev *pdev = to_pci_dev(device); - struct net_device *dev = pci_get_drvdata(pdev); - struct rtl8169_private *tp = netdev_priv(dev); + struct rtl8169_private *tp = dev_get_drvdata(device); rtl8169_init_phy(tp); - if (netif_running(dev)) - __rtl8169_resume(dev); + if (netif_running(tp->dev)) + __rtl8169_resume(tp->dev); return 0; } static int rtl8169_runtime_suspend(struct device *device) { - struct pci_dev *pdev = to_pci_dev(device); - struct net_device *dev = pci_get_drvdata(pdev); - struct rtl8169_private *tp = netdev_priv(dev); + struct rtl8169_private *tp = dev_get_drvdata(device); if (!tp->TxDescArray) { rtl_pll_power_down(tp); @@ -7852,10 +7847,10 @@ static int rtl8169_runtime_suspend(struct device *device) __rtl8169_set_wol(tp, WAKE_ANY); rtl_unlock_work(tp); - rtl8169_net_suspend(dev); + rtl8169_net_suspend(tp->dev); /* Update counters before going runtime suspend */ - rtl8169_rx_missed(dev); + rtl8169_rx_missed(tp->dev); rtl8169_update_counters(tp); return 0; @@ -7863,10 +7858,9 @@ static int rtl8169_runtime_suspend(struct device *device) static int rtl8169_runtime_resume(struct device *device) { - struct pci_dev *pdev = to_pci_dev(device); - struct net_device *dev = pci_get_drvdata(pdev); - struct rtl8169_private *tp = netdev_priv(dev); - rtl_rar_set(tp, dev->dev_addr); + struct rtl8169_private *tp = dev_get_drvdata(device); + + rtl_rar_set(tp, tp->dev->dev_addr); if (!tp->TxDescArray) return 0; @@ -7878,17 +7872,16 @@ static int rtl8169_runtime_resume(struct device *device) rtl8169_init_phy(tp); - __rtl8169_resume(dev); + __rtl8169_resume(tp->dev); return 0; } static int rtl8169_runtime_idle(struct device *device) { - struct pci_dev *pdev = to_pci_dev(device); - struct net_device *dev = pci_get_drvdata(pdev); + struct rtl8169_private *tp = dev_get_drvdata(device); - if (!netif_running(dev) || !netif_carrier_ok(dev)) + if (!netif_running(tp->dev) || !netif_carrier_ok(tp->dev)) pm_schedule_suspend(device, 10000); return -EBUSY; @@ -7934,13 +7927,12 @@ static void rtl_wol_shutdown_quirk(struct rtl8169_private *tp) static void rtl_shutdown(struct pci_dev *pdev) { - struct net_device *dev = pci_get_drvdata(pdev); - struct rtl8169_private *tp = netdev_priv(dev); + struct rtl8169_private *tp = pci_get_drvdata(pdev); - rtl8169_net_suspend(dev); + rtl8169_net_suspend(tp->dev); /* Restore original MAC address */ - rtl_rar_set(tp, dev->perm_addr); + rtl_rar_set(tp, tp->dev->perm_addr); rtl8169_hw_reset(tp); @@ -7957,15 +7949,14 @@ static void rtl_shutdown(struct pci_dev *pdev) static void rtl_remove_one(struct pci_dev *pdev) { - struct net_device *dev = pci_get_drvdata(pdev); - struct rtl8169_private *tp = netdev_priv(dev); + struct rtl8169_private *tp = pci_get_drvdata(pdev); if (r8168_check_dash(tp)) rtl8168_driver_stop(tp); netif_napi_del(&tp->napi); - unregister_netdev(dev); + unregister_netdev(tp->dev); rtl_release_firmware(tp); @@ -7973,7 +7964,7 @@ static void rtl_remove_one(struct pci_dev *pdev) pm_runtime_get_noresume(&pdev->dev); /* restore original MAC address */ - rtl_rar_set(tp, dev->perm_addr); + rtl_rar_set(tp, tp->dev->perm_addr); } static const struct net_device_ops rtl_netdev_ops = { @@ -8361,7 +8352,7 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) if (rc < 0) return rc; - pci_set_drvdata(pdev, dev); + pci_set_drvdata(pdev, tp); netif_info(tp, probe, dev, "%s at 0x%p, %pM, XID %08x IRQ %d\n", rtl_chip_infos[chipset].name, tp->mmio_addr, dev->dev_addr, -- 2.16.2