Skip to content

Commit

Permalink
bcma: add stub for bcma_bus_suspend()
Browse files Browse the repository at this point in the history
.. 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>
  • Loading branch information
Linus Torvalds authored and John W. Linville committed Jan 17, 2012
1 parent 5d2031f commit 685a4ef
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 1 deletion.
1 change: 1 addition & 0 deletions drivers/bcma/bcma_private.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion drivers/bcma/host_pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
5 changes: 5 additions & 0 deletions drivers/bcma/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 685a4ef

Please sign in to comment.