Commit 0f07bd85 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by David S. Miller
Browse files

r8169: use dev_get_drvdata where possible 



Using dev_get_drvdata directly is simpler here.

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fe716f8a

drivers/net/ethernet/realtek/r8169.c

+5 −10
Original line number Original line Diff line number Diff line
@@ -6819,8 +6819,7 @@ static void rtl8169_net_suspend(struct net_device *dev) 




static int rtl8169_suspend(struct device *device)

static int rtl8169_suspend(struct device *device)

{

{

	struct pci_dev *pdev = to_pci_dev(device);

	struct net_device *dev = dev_get_drvdata(device);

	struct net_device *dev = pci_get_drvdata(pdev);

	struct rtl8169_private *tp = netdev_priv(dev);

	struct rtl8169_private *tp = netdev_priv(dev);





	rtl8169_net_suspend(dev);

	rtl8169_net_suspend(dev);
@@ -6850,8 +6849,7 @@ static void __rtl8169_resume(struct net_device *dev) 




static int rtl8169_resume(struct device *device)

static int rtl8169_resume(struct device *device)

{

{

	struct pci_dev *pdev = to_pci_dev(device);

	struct net_device *dev = dev_get_drvdata(device);

	struct net_device *dev = pci_get_drvdata(pdev);

	struct rtl8169_private *tp = netdev_priv(dev);

	struct rtl8169_private *tp = netdev_priv(dev);





	clk_prepare_enable(tp->clk);

	clk_prepare_enable(tp->clk);
@@ -6864,8 +6862,7 @@ static int rtl8169_resume(struct device *device) 




static int rtl8169_runtime_suspend(struct device *device)

static int rtl8169_runtime_suspend(struct device *device)

{

{

	struct pci_dev *pdev = to_pci_dev(device);

	struct net_device *dev = dev_get_drvdata(device);

	struct net_device *dev = pci_get_drvdata(pdev);

	struct rtl8169_private *tp = netdev_priv(dev);

	struct rtl8169_private *tp = netdev_priv(dev);





	if (!tp->TxDescArray)

	if (!tp->TxDescArray)
@@ -6886,8 +6883,7 @@ static int rtl8169_runtime_suspend(struct device *device) 




static int rtl8169_runtime_resume(struct device *device)

static int rtl8169_runtime_resume(struct device *device)

{

{

	struct pci_dev *pdev = to_pci_dev(device);

	struct net_device *dev = dev_get_drvdata(device);

	struct net_device *dev = pci_get_drvdata(pdev);

	struct rtl8169_private *tp = netdev_priv(dev);

	struct rtl8169_private *tp = netdev_priv(dev);

	rtl_rar_set(tp, dev->dev_addr);

	rtl_rar_set(tp, dev->dev_addr);
@@ -6905,8 +6901,7 @@ static int rtl8169_runtime_resume(struct device *device) 




static int rtl8169_runtime_idle(struct device *device)

static int rtl8169_runtime_idle(struct device *device)

{

{

	struct pci_dev *pdev = to_pci_dev(device);

	struct net_device *dev = dev_get_drvdata(device);

	struct net_device *dev = pci_get_drvdata(pdev);





	if (!netif_running(dev) || !netif_carrier_ok(dev))

	if (!netif_running(dev) || !netif_carrier_ok(dev))

		pm_schedule_suspend(device, 10000);

		pm_schedule_suspend(device, 10000);

CRA Git | Maintained and supported by SUSTech CRA and CCSE