diff options
| author | Nick Pelly <npelly@google.com> | 2008-12-04 17:37:05 -0800 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2016-02-16 13:51:46 -0800 |
| commit | c805cbb1cc0c8d579c0881b6024fe303820bab2b (patch) | |
| tree | 66108949d9081fa1132859d803f3fa3989296ead /net/rfkill | |
| parent | 3823c8136f2170b3ac5e6a5f8b857746a786e845 (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, 8 insertions, 1 deletions
diff --git a/net/rfkill/Kconfig b/net/rfkill/Kconfig index 598d374f6a35..44c3be9d1021 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 f53bf3b6558b..9f843bbe8c10 100644 --- a/net/rfkill/core.c +++ b/net/rfkill/core.c @@ -802,7 +802,7 @@ void rfkill_resume_polling(struct rfkill *rfkill) } EXPORT_SYMBOL(rfkill_resume_polling); -#ifdef CONFIG_PM_SLEEP +#ifdef CONFIG_RFKILL_PM static int rfkill_suspend(struct device *dev) { struct rfkill *rfkill = to_rfkill(dev); @@ -838,7 +838,9 @@ static struct class rfkill_class = { .dev_release = rfkill_release, .dev_groups = rfkill_dev_groups, .dev_uevent = rfkill_dev_uevent, +#ifdef CONFIG_RFKILL_PM .pm = RFKILL_PM_OPS, +#endif }; bool rfkill_blocked(struct rfkill *rfkill) |