iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bcma: convert suspend/resume to pm_ops

Browse Source 
.. and avoid doing the unnecessary PCI operations - the PCI layer will
do them for us.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Linus Torvalds 2012-01-13 23:58:39 +01:00 committed by John W. Linville
parent d32a102819
commit 5d2031f239
1 changed files with 17 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
drivers/bcma/host_pci.c
View File

@ -235,41 +235,32 @@ static void bcma_host_pci_remove(struct pci_dev *dev)
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int bcma_host_pci_suspend(struct pci_dev *dev, pm_message_t state) static int bcma_host_pci_suspend(struct device *dev)
{ {
struct bcma_bus *bus = pci_get_drvdata(dev); struct pci_dev *pdev = to_pci_dev(dev);
struct bcma_bus *bus = pci_get_drvdata(pdev);
/* Host specific */
pci_save_state(dev);
pci_disable_device(dev);
pci_set_power_state(dev, pci_choose_state(dev, state));
bus->mapped_core = NULL; bus->mapped_core = NULL;
return 0; return 0;
} }
static int bcma_host_pci_resume(struct pci_dev *dev) static int bcma_host_pci_resume(struct device *dev)
{ {
struct bcma_bus *bus = pci_get_drvdata(dev); struct pci_dev *pdev = to_pci_dev(dev);
int err; struct bcma_bus *bus = pci_get_drvdata(pdev);
/* Host specific */ return bcma_bus_resume(bus);
pci_set_power_state(dev, 0);
err = pci_enable_device(dev);
if (err)
return err;
pci_restore_state(dev);
/* Bus specific */
err = bcma_bus_resume(bus);
if (err)
return err;
return 0;
} }
static SIMPLE_DEV_PM_OPS(bcma_pm_ops, bcma_host_pci_suspend,
bcma_host_pci_resume);
#define BCMA_PM_OPS (&bcma_pm_ops)
#else /* CONFIG_PM */ #else /* CONFIG_PM */
# define bcma_host_pci_suspend NULL
# define bcma_host_pci_resume NULL #define BCMA_PM_OPS NULL
#endif /* CONFIG_PM */ #endif /* CONFIG_PM */
static DEFINE_PCI_DEVICE_TABLE(bcma_pci_bridge_tbl) = { static DEFINE_PCI_DEVICE_TABLE(bcma_pci_bridge_tbl) = {
@ -287,8 +278,7 @@ static struct pci_driver bcma_pci_bridge_driver = {
.id_table = bcma_pci_bridge_tbl, .id_table = bcma_pci_bridge_tbl,
.probe = bcma_host_pci_probe, .probe = bcma_host_pci_probe,
.remove = bcma_host_pci_remove, .remove = bcma_host_pci_remove,
.suspend = bcma_host_pci_suspend, .driver.pm = BCMA_PM_OPS,
.resume = bcma_host_pci_resume,
}; };
int __init bcma_host_pci_init(void) int __init bcma_host_pci_init(void)