summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-01-13 23:58:40 +0100
committerJohn W. Linville <linville@tuxdriver.com>2012-01-17 09:54:05 -0500
commit685a4ef0df23b97eea1842c2698da9a2e35fc976 (patch)
tree863612511ce9164af706d9d5e0d561f088d84f15 /drivers
parent5d2031f2395728c765cf2bd7c1ebb6d51c4fe076 (diff)
downloadlinux-3.10-685a4ef0df23b97eea1842c2698da9a2e35fc976.tar.gz
linux-3.10-685a4ef0df23b97eea1842c2698da9a2e35fc976.tar.bz2
linux-3.10-685a4ef0df23b97eea1842c2698da9a2e35fc976.zip
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')
-rw-r--r--drivers/bcma/bcma_private.h1
-rw-r--r--drivers/bcma/host_pci.c2
-rw-r--r--drivers/bcma/main.c5
3 files changed, 7 insertions, 1 deletions
diff --git a/drivers/bcma/bcma_private.h b/drivers/bcma/bcma_private.h
index fda56bde36b..0def898a1d1 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,
struct bcma_device *core_cc,
struct bcma_device *core_mips);
#ifdef CONFIG_PM
+int bcma_bus_suspend(struct bcma_bus *bus);
int bcma_bus_resume(struct bcma_bus *bus);
#endif
diff --git a/drivers/bcma/host_pci.c b/drivers/bcma/host_pci.c
index 86dfeea77e1..f59244e3397 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)
bus->mapped_core = NULL;
- return 0;
+ return bcma_bus_suspend(bus);
}
static int bcma_host_pci_resume(struct device *dev)
diff --git a/drivers/bcma/main.c b/drivers/bcma/main.c
index 10f92b371e5..b711d9d634a 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,
}
#ifdef CONFIG_PM
+int bcma_bus_suspend(struct bcma_bus *bus)
+{
+ return 0;
+}
+
int bcma_bus_resume(struct bcma_bus *bus)
{
struct bcma_device *core;