Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 685a4ef0 authored by Linus Torvalds's avatar Linus Torvalds Committed by John W. Linville
Browse files

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: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarRafał Miłecki <zajec5@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 5d2031f2

drivers/bcma/bcma_private.h

+1 −0
Original line number Diff line number Diff line
@@ -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

drivers/bcma/host_pci.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

drivers/bcma/main.c

+5 −0
Original line number Diff line number Diff line
@@ -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;