diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-13 17:58:40 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-01-17 09:54:05 -0500 |
commit | 685a4ef0df23b97eea1842c2698da9a2e35fc976 (patch) | |
tree | 863612511ce9164af706d9d5e0d561f088d84f15 /drivers/bcma | |
parent | 5d2031f2395728c765cf2bd7c1ebb6d51c4fe076 (diff) |
bcma: add stub for bcma_bus_suspend()
.. and connect it up with the pci host bcma driver.
Now, the next step is to connect those bcma bus-level suspend/resume
functions to the actual bcma device suspend resume functions.
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>
Diffstat (limited to 'drivers/bcma')
-rw-r--r-- | drivers/bcma/bcma_private.h | 1 | ||||
-rw-r--r-- | drivers/bcma/host_pci.c | 2 | ||||
-rw-r--r-- | drivers/bcma/main.c | 5 |
3 files changed, 7 insertions, 1 deletions
diff --git a/drivers/bcma/bcma_private.h b/drivers/bcma/bcma_private.h index fda56bde36b8..0def898a1d15 100644 --- a/drivers/bcma/bcma_private.h +++ b/drivers/bcma/bcma_private.h | |||
@@ -19,6 +19,7 @@ int __init bcma_bus_early_register(struct bcma_bus *bus, | |||
19 | struct bcma_device *core_cc, | 19 | struct bcma_device *core_cc, |
20 | struct bcma_device *core_mips); | 20 | struct bcma_device *core_mips); |
21 | #ifdef CONFIG_PM | 21 | #ifdef CONFIG_PM |
22 | int bcma_bus_suspend(struct bcma_bus *bus); | ||
22 | int bcma_bus_resume(struct bcma_bus *bus); | 23 | int bcma_bus_resume(struct bcma_bus *bus); |
23 | #endif | 24 | #endif |
24 | 25 | ||
diff --git a/drivers/bcma/host_pci.c b/drivers/bcma/host_pci.c index 86dfeea77e1a..f59244e33971 100644 --- a/drivers/bcma/host_pci.c +++ b/drivers/bcma/host_pci.c | |||
@@ -242,7 +242,7 @@ static int bcma_host_pci_suspend(struct device *dev) | |||
242 | 242 | ||
243 | bus->mapped_core = NULL; | 243 | bus->mapped_core = NULL; |
244 | 244 | ||
245 | return 0; | 245 | return bcma_bus_suspend(bus); |
246 | } | 246 | } |
247 | 247 | ||
248 | static int bcma_host_pci_resume(struct device *dev) | 248 | static int bcma_host_pci_resume(struct device *dev) |
diff --git a/drivers/bcma/main.c b/drivers/bcma/main.c index 10f92b371e58..b711d9d634a7 100644 --- a/drivers/bcma/main.c +++ b/drivers/bcma/main.c | |||
@@ -241,6 +241,11 @@ int __init bcma_bus_early_register(struct bcma_bus *bus, | |||
241 | } | 241 | } |
242 | 242 | ||
243 | #ifdef CONFIG_PM | 243 | #ifdef CONFIG_PM |
244 | int bcma_bus_suspend(struct bcma_bus *bus) | ||
245 | { | ||
246 | return 0; | ||
247 | } | ||
248 | |||
244 | int bcma_bus_resume(struct bcma_bus *bus) | 249 | int bcma_bus_resume(struct bcma_bus *bus) |
245 | { | 250 | { |
246 | struct bcma_device *core; | 251 | struct bcma_device *core; |