Commit 6ad70c76 authored by Vaibhav Gupta's avatar Vaibhav Gupta Committed by David S. Miller
Browse files

realtek/8139too: use generic power management 



compile-tested only

With legacy PM hooks, it was the responsibility
of a driver to manage PCI states and also
device's power state. The generic approach is
to let PCI core handle the work.

PCI core passes "struct device*" as an argument
to the .suspend() and .resume() callbacks. As
these callabcks work with "struct net_device*",
extract it from "struct device*" using
dev_get_drv_data().

Signed-off-by: default avatarVaibhav Gupta <vaibhavgupta40@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f8e48fca

drivers/net/ethernet/realtek/8139too.c

+7 −19
Original line number Diff line number Diff line
@@ -2603,17 +2603,13 @@ static void rtl8139_set_rx_mode (struct net_device *dev) 
	spin_unlock_irqrestore (&tp->lock, flags);

}



#ifdef CONFIG_PM



static int rtl8139_suspend (struct pci_dev *pdev, pm_message_t state)

static int __maybe_unused rtl8139_suspend(struct device *device)

{

	struct net_device *dev = pci_get_drvdata (pdev);

	struct net_device *dev = dev_get_drvdata(device);

	struct rtl8139_private *tp = netdev_priv(dev);

	void __iomem *ioaddr = tp->mmio_addr;

	unsigned long flags;



	pci_save_state (pdev);



	if (!netif_running (dev))

		return 0;
@@ -2631,38 +2627,30 @@ static int rtl8139_suspend (struct pci_dev *pdev, pm_message_t state) 


	spin_unlock_irqrestore (&tp->lock, flags);



	pci_set_power_state (pdev, PCI_D3hot);



	return 0;

}





static int rtl8139_resume (struct pci_dev *pdev)

static int __maybe_unused rtl8139_resume(struct device *device)

{

	struct net_device *dev = pci_get_drvdata (pdev);

	struct net_device *dev = dev_get_drvdata(device);



	pci_restore_state (pdev);

	if (!netif_running (dev))

		return 0;

	pci_set_power_state (pdev, PCI_D0);



	rtl8139_init_ring (dev);

	rtl8139_hw_start (dev);

	netif_device_attach (dev);

	return 0;

}



#endif /* CONFIG_PM */



static SIMPLE_DEV_PM_OPS(rtl8139_pm_ops, rtl8139_suspend, rtl8139_resume);



static struct pci_driver rtl8139_pci_driver = {

	.name		= DRV_NAME,

	.id_table	= rtl8139_pci_tbl,

	.probe		= rtl8139_init_one,

	.remove		= rtl8139_remove_one,

#ifdef CONFIG_PM

	.suspend	= rtl8139_suspend,

	.resume		= rtl8139_resume,

#endif /* CONFIG_PM */

	.driver.pm	= &rtl8139_pm_ops,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE