Commit e9c971bd authored by Vaibhav Gupta's avatar Vaibhav Gupta Committed by Tony Nguyen
Browse files

igbvf: use generic power management 



Remove legacy PM callbacks and use generic operations. With legacy code,
drivers were responsible for handling PCI PM operations like
pci_save_state(). In generic code, all these are handled by PCI core.

The generic suspend() and resume() are called at the same point the legacy
ones were called. Thus, it does not affect the normal functioning of the
driver.

__maybe_unused attribute is used with .resume() but not with .suspend(), as
.suspend() is called by .shutdown().

Compile-tested only.

Signed-off-by: default avatarVaibhav Gupta <vaibhavgupta40@gmail.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent bc5cbd73

drivers/net/ethernet/intel/igbvf/netdev.c

+8 −29
Original line number Diff line number Diff line
@@ -2457,13 +2457,10 @@ static int igbvf_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd) 
	}

}



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

static int igbvf_suspend(struct device *dev_d)

{

	struct net_device *netdev = pci_get_drvdata(pdev);

	struct net_device *netdev = dev_get_drvdata(dev_d);

	struct igbvf_adapter *adapter = netdev_priv(netdev);

#ifdef CONFIG_PM

	int retval = 0;

#endif



	netif_device_detach(netdev);
@@ -2473,31 +2470,16 @@ static int igbvf_suspend(struct pci_dev *pdev, pm_message_t state) 
		igbvf_free_irq(adapter);

	}



#ifdef CONFIG_PM

	retval = pci_save_state(pdev);

	if (retval)

		return retval;

#endif



	pci_disable_device(pdev);



	return 0;

}



#ifdef CONFIG_PM

static int igbvf_resume(struct pci_dev *pdev)

static int __maybe_unused igbvf_resume(struct device *dev_d)

{

	struct pci_dev *pdev = to_pci_dev(dev_d);

	struct net_device *netdev = pci_get_drvdata(pdev);

	struct igbvf_adapter *adapter = netdev_priv(netdev);

	u32 err;



	pci_restore_state(pdev);

	err = pci_enable_device_mem(pdev);

	if (err) {

		dev_err(&pdev->dev, "Cannot enable PCI device from suspend\n");

		return err;

	}



	pci_set_master(pdev);



	if (netif_running(netdev)) {
@@ -2515,11 +2497,10 @@ static int igbvf_resume(struct pci_dev *pdev) 


	return 0;

}

#endif



static void igbvf_shutdown(struct pci_dev *pdev)

{

	igbvf_suspend(pdev, PMSG_SUSPEND);

	igbvf_suspend(&pdev->dev);

}



#ifdef CONFIG_NET_POLL_CONTROLLER
@@ -2960,17 +2941,15 @@ static const struct pci_device_id igbvf_pci_tbl[] = { 
};

MODULE_DEVICE_TABLE(pci, igbvf_pci_tbl);



static SIMPLE_DEV_PM_OPS(igbvf_pm_ops, igbvf_suspend, igbvf_resume);



/* PCI Device API Driver */

static struct pci_driver igbvf_driver = {

	.name		= igbvf_driver_name,

	.id_table	= igbvf_pci_tbl,

	.probe		= igbvf_probe,

	.remove		= igbvf_remove,

#ifdef CONFIG_PM

	/* Power Management Hooks */

	.suspend	= igbvf_suspend,

	.resume		= igbvf_resume,

#endif

	.driver.pm	= &igbvf_pm_ops,

	.shutdown	= igbvf_shutdown,

	.err_handler	= &igbvf_err_handler

};