.. | .. |
---|
424 | 424 | xgbe_free_pdata(pdata); |
---|
425 | 425 | } |
---|
426 | 426 | |
---|
427 | | -#ifdef CONFIG_PM |
---|
428 | | -static int xgbe_pci_suspend(struct pci_dev *pdev, pm_message_t state) |
---|
| 427 | +static int __maybe_unused xgbe_pci_suspend(struct device *dev) |
---|
429 | 428 | { |
---|
430 | | - struct xgbe_prv_data *pdata = pci_get_drvdata(pdev); |
---|
| 429 | + struct xgbe_prv_data *pdata = dev_get_drvdata(dev); |
---|
431 | 430 | struct net_device *netdev = pdata->netdev; |
---|
432 | 431 | int ret = 0; |
---|
433 | 432 | |
---|
.. | .. |
---|
441 | 440 | return ret; |
---|
442 | 441 | } |
---|
443 | 442 | |
---|
444 | | -static int xgbe_pci_resume(struct pci_dev *pdev) |
---|
| 443 | +static int __maybe_unused xgbe_pci_resume(struct device *dev) |
---|
445 | 444 | { |
---|
446 | | - struct xgbe_prv_data *pdata = pci_get_drvdata(pdev); |
---|
| 445 | + struct xgbe_prv_data *pdata = dev_get_drvdata(dev); |
---|
447 | 446 | struct net_device *netdev = pdata->netdev; |
---|
448 | 447 | int ret = 0; |
---|
449 | 448 | |
---|
.. | .. |
---|
463 | 462 | |
---|
464 | 463 | return ret; |
---|
465 | 464 | } |
---|
466 | | -#endif /* CONFIG_PM */ |
---|
467 | 465 | |
---|
468 | 466 | static const struct xgbe_version_data xgbe_v2a = { |
---|
469 | 467 | .init_function_ptrs_phy_impl = xgbe_init_function_ptrs_phy_v2, |
---|
.. | .. |
---|
505 | 503 | }; |
---|
506 | 504 | MODULE_DEVICE_TABLE(pci, xgbe_pci_table); |
---|
507 | 505 | |
---|
| 506 | +static SIMPLE_DEV_PM_OPS(xgbe_pci_pm_ops, xgbe_pci_suspend, xgbe_pci_resume); |
---|
| 507 | + |
---|
508 | 508 | static struct pci_driver xgbe_driver = { |
---|
509 | 509 | .name = XGBE_DRV_NAME, |
---|
510 | 510 | .id_table = xgbe_pci_table, |
---|
511 | 511 | .probe = xgbe_pci_probe, |
---|
512 | 512 | .remove = xgbe_pci_remove, |
---|
513 | | -#ifdef CONFIG_PM |
---|
514 | | - .suspend = xgbe_pci_suspend, |
---|
515 | | - .resume = xgbe_pci_resume, |
---|
516 | | -#endif |
---|
| 513 | + .driver = { |
---|
| 514 | + .pm = &xgbe_pci_pm_ops, |
---|
| 515 | + } |
---|
517 | 516 | }; |
---|
518 | 517 | |
---|
519 | 518 | int xgbe_pci_init(void) |
---|