Commit 6bbf5256 authored by Vaibhav Gupta's avatar Vaibhav Gupta Committed by Greg Kroah-Hartman

misc/phantom.c: use generic power management

With the support of generic PM callbacks, drivers no longer need to use
legacy .suspend() and .resume() in which they had to maintain PCI states
changes and device's power state themselves. All required operations are
done by PCI core.

Driver needs to do only device-specific operations.

Compile-tested only.
Signed-off-by: default avatarVaibhav Gupta <vaibhavgupta40@gmail.com>
Link: https://lore.kernel.org/r/20200629081531.214734-5-vaibhavgupta40@gmail.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ff249c1c
...@@ -457,31 +457,26 @@ static void phantom_remove(struct pci_dev *pdev) ...@@ -457,31 +457,26 @@ static void phantom_remove(struct pci_dev *pdev)
pci_disable_device(pdev); pci_disable_device(pdev);
} }
#ifdef CONFIG_PM static int __maybe_unused phantom_suspend(struct device *dev_d)
static int phantom_suspend(struct pci_dev *pdev, pm_message_t state)
{ {
struct phantom_device *dev = pci_get_drvdata(pdev); struct phantom_device *dev = dev_get_drvdata(dev_d);
iowrite32(0, dev->caddr + PHN_IRQCTL); iowrite32(0, dev->caddr + PHN_IRQCTL);
ioread32(dev->caddr + PHN_IRQCTL); /* PCI posting */ ioread32(dev->caddr + PHN_IRQCTL); /* PCI posting */
synchronize_irq(pdev->irq); synchronize_irq(to_pci_dev(dev_d)->irq);
return 0; return 0;
} }
static int phantom_resume(struct pci_dev *pdev) static int __maybe_unused phantom_resume(struct device *dev_d)
{ {
struct phantom_device *dev = pci_get_drvdata(pdev); struct phantom_device *dev = dev_get_drvdata(dev_d);
iowrite32(0, dev->caddr + PHN_IRQCTL); iowrite32(0, dev->caddr + PHN_IRQCTL);
return 0; return 0;
} }
#else
#define phantom_suspend NULL
#define phantom_resume NULL
#endif
static struct pci_device_id phantom_pci_tbl[] = { static struct pci_device_id phantom_pci_tbl[] = {
{ .vendor = PCI_VENDOR_ID_PLX, .device = PCI_DEVICE_ID_PLX_9050, { .vendor = PCI_VENDOR_ID_PLX, .device = PCI_DEVICE_ID_PLX_9050,
...@@ -491,13 +486,14 @@ static struct pci_device_id phantom_pci_tbl[] = { ...@@ -491,13 +486,14 @@ static struct pci_device_id phantom_pci_tbl[] = {
}; };
MODULE_DEVICE_TABLE(pci, phantom_pci_tbl); MODULE_DEVICE_TABLE(pci, phantom_pci_tbl);
static SIMPLE_DEV_PM_OPS(phantom_pm_ops, phantom_suspend, phantom_resume);
static struct pci_driver phantom_pci_driver = { static struct pci_driver phantom_pci_driver = {
.name = "phantom", .name = "phantom",
.id_table = phantom_pci_tbl, .id_table = phantom_pci_tbl,
.probe = phantom_probe, .probe = phantom_probe,
.remove = phantom_remove, .remove = phantom_remove,
.suspend = phantom_suspend, .driver.pm = &phantom_pm_ops,
.resume = phantom_resume
}; };
static CLASS_ATTR_STRING(version, 0444, PHANTOM_VERSION); static CLASS_ATTR_STRING(version, 0444, PHANTOM_VERSION);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment