Skip to content

Commit 4c2ad12

Browse files
VARoDeKdavem330
authored andcommitted
vxge: 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. Use "struct dev_pm_ops" variable to bind the callbacks. Compile-tested only. Signed-off-by: Vaibhav Gupta <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 6412061 commit 4c2ad12

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

drivers/net/ethernet/neterion/vxge/vxge-main.c

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3999,26 +3999,23 @@ static void vxge_print_parm(struct vxgedev *vdev, u64 vpath_mask)
39993999
}
40004000
}
40014001

4002-
#ifdef CONFIG_PM
40034002
/**
40044003
* vxge_pm_suspend - vxge power management suspend entry point
40054004
*
40064005
*/
4007-
static int vxge_pm_suspend(struct pci_dev *pdev, pm_message_t state)
4006+
static int __maybe_unused vxge_pm_suspend(struct device *dev_d)
40084007
{
40094008
return -ENOSYS;
40104009
}
40114010
/**
40124011
* vxge_pm_resume - vxge power management resume entry point
40134012
*
40144013
*/
4015-
static int vxge_pm_resume(struct pci_dev *pdev)
4014+
static int __maybe_unused vxge_pm_resume(struct device *dev_d)
40164015
{
40174016
return -ENOSYS;
40184017
}
40194018

4020-
#endif
4021-
40224019
/**
40234020
* vxge_io_error_detected - called when PCI error is detected
40244021
* @pdev: Pointer to PCI device
@@ -4796,15 +4793,14 @@ static const struct pci_error_handlers vxge_err_handler = {
47964793
.resume = vxge_io_resume,
47974794
};
47984795

4796+
static SIMPLE_DEV_PM_OPS(vxge_pm_ops, vxge_pm_suspend, vxge_pm_resume);
4797+
47994798
static struct pci_driver vxge_driver = {
48004799
.name = VXGE_DRIVER_NAME,
48014800
.id_table = vxge_id_table,
48024801
.probe = vxge_probe,
48034802
.remove = vxge_remove,
4804-
#ifdef CONFIG_PM
4805-
.suspend = vxge_pm_suspend,
4806-
.resume = vxge_pm_resume,
4807-
#endif
4803+
.driver.pm = &vxge_pm_ops,
48084804
.err_handler = &vxge_err_handler,
48094805
};
48104806

0 commit comments

Comments
 (0)