diff options
author | Nick Pelly <npelly@google.com> | 2011-12-13 01:11:43 +0800 |
---|---|---|
committer | Andy Green <andy.green@linaro.org> | 2011-12-26 15:43:05 +0800 |
commit | 198f8a0e6004baa12baf9415d50b61a70e70fab5 (patch) | |
tree | 8809eb6ef52b18319c103272c639f426a6ad5fd4 /net/rfkill | |
parent | 29501556dfb288af7ce42bb68a005ed50a6238e2 (diff) |
rfkill: Introduce CONFIG_RFKILL_PM and use instead of
CONFIG_PM to power down
Some platforms do not want to power down rfkill devices on suspend.
Change-Id: I62a11630521c636d54a4a02ab9037a43435925f5
Signed-off-by: Nick Pelly <npelly@google.com>
Diffstat (limited to 'net/rfkill')
-rw-r--r-- | net/rfkill/Kconfig | 5 | ||||
-rw-r--r-- | net/rfkill/core.c | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/net/rfkill/Kconfig b/net/rfkill/Kconfig index 78efe895b66..8e12c8a2b82 100644 --- a/net/rfkill/Kconfig +++ b/net/rfkill/Kconfig @@ -10,6 +10,11 @@ menuconfig RFKILL To compile this driver as a module, choose M here: the module will be called rfkill. +config RFKILL_PM + bool "Power off on suspend" + depends on RFKILL && PM + default y + # LED trigger support config RFKILL_LEDS bool diff --git a/net/rfkill/core.c b/net/rfkill/core.c index 5be19575c34..c20cd64b60b 100644 --- a/net/rfkill/core.c +++ b/net/rfkill/core.c @@ -769,6 +769,7 @@ void rfkill_pause_polling(struct rfkill *rfkill) } EXPORT_SYMBOL(rfkill_pause_polling); +#ifdef CONFIG_RFKILL_PM void rfkill_resume_polling(struct rfkill *rfkill) { BUG_ON(!rfkill); @@ -803,14 +804,17 @@ static int rfkill_resume(struct device *dev) return 0; } +#endif static struct class rfkill_class = { .name = "rfkill", .dev_release = rfkill_release, .dev_attrs = rfkill_dev_attrs, .dev_uevent = rfkill_dev_uevent, +#ifdef CONFIG_RFKILL_PM .suspend = rfkill_suspend, .resume = rfkill_resume, +#endif }; bool rfkill_blocked(struct rfkill *rfkill) |