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

starfire: use generic power management 



With legacy PM, drivers themselves were responsible for managing the
device's power states and takes care of register states.

After upgrading to the generic structure, PCI core will take care of
required tasks and drivers should do only device-specific operations.

Thus, there is no need to call the PCI helper functions like
pci_save/restore_sate() and pci_set_power_state().

Compile-tested only.

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

drivers/net/ethernet/adaptec/starfire.c

+6 −17
Original line number Original line Diff line number Diff line
@@ -1984,28 +1984,21 @@ static int netdev_close(struct net_device *dev) 
	return 0;

	return 0;

}

}





#ifdef CONFIG_PM

static int __maybe_unused starfire_suspend(struct device *dev_d)

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

{

{

	struct net_device *dev = pci_get_drvdata(pdev);

	struct net_device *dev = dev_get_drvdata(dev_d);





	if (netif_running(dev)) {

	if (netif_running(dev)) {

		netif_device_detach(dev);

		netif_device_detach(dev);

		netdev_close(dev);

		netdev_close(dev);

	}

	}





	pci_save_state(pdev);

	pci_set_power_state(pdev, pci_choose_state(pdev,state));



	return 0;

	return 0;

}

}





static int starfire_resume(struct pci_dev *pdev)

static int __maybe_unused starfire_resume(struct device *dev_d)

{

{

	struct net_device *dev = pci_get_drvdata(pdev);

	struct net_device *dev = dev_get_drvdata(dev_d);



	pci_set_power_state(pdev, PCI_D0);

	pci_restore_state(pdev);





	if (netif_running(dev)) {

	if (netif_running(dev)) {

		netdev_open(dev);

		netdev_open(dev);
@@ -2014,8 +2007,6 @@ static int starfire_resume(struct pci_dev *pdev) 




	return 0;

	return 0;

}

}

#endif /* CONFIG_PM */







static void starfire_remove_one(struct pci_dev *pdev)

static void starfire_remove_one(struct pci_dev *pdev)

{

{
@@ -2040,15 +2031,13 @@ static void starfire_remove_one(struct pci_dev *pdev) 
	free_netdev(dev);			/* Will also free np!! */

	free_netdev(dev);			/* Will also free np!! */

}

}





static SIMPLE_DEV_PM_OPS(starfire_pm_ops, starfire_suspend, starfire_resume);





static struct pci_driver starfire_driver = {

static struct pci_driver starfire_driver = {

	.name		= DRV_NAME,

	.name		= DRV_NAME,

	.probe		= starfire_init_one,

	.probe		= starfire_init_one,

	.remove		= starfire_remove_one,

	.remove		= starfire_remove_one,

#ifdef CONFIG_PM

	.driver.pm	= &starfire_pm_ops,

	.suspend	= starfire_suspend,

	.resume		= starfire_resume,

#endif /* CONFIG_PM */

	.id_table	= starfire_pci_tbl,

	.id_table	= starfire_pci_tbl,

};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE