github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 14:42:37 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ANDROID: rfkill: Introduce CONFIG_RFKILL_PM and use instead of CONFIG_PM to power down

Browse Source 
Some platforms do not want to power down rfkill devices on suspend.

Change-Id: I62a11630521c636d54a4a02ab9037a43435925f5
Signed-off-by: Nick Pelly <npelly@google.com>
This commit is contained in:
Nick Pelly 2008-12-04 17:37:05 -08:00 committed by Dmitry Shmidt
parent 3fc1c613ea
commit de6f7210e9
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/rfkill/Kconfig
View File

@ -10,6 +10,11 @@ menuconfig RFKILL
To compile this driver as a module, choose M here: the To compile this driver as a module, choose M here: the
module will be called rfkill. module will be called rfkill.
config RFKILL_PM
bool "Power off on suspend"
depends on RFKILL && PM
default y
# LED trigger support # LED trigger support
config RFKILL_LEDS config RFKILL_LEDS
bool bool

4
net/rfkill/core.c
View File

@ -796,7 +796,7 @@ void rfkill_resume_polling(struct rfkill *rfkill)
} }
EXPORT_SYMBOL(rfkill_resume_polling); EXPORT_SYMBOL(rfkill_resume_polling);
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_RFKILL_PM
static int rfkill_suspend(struct device *dev) static int rfkill_suspend(struct device *dev)
{ {
struct rfkill *rfkill = to_rfkill(dev); struct rfkill *rfkill = to_rfkill(dev);
@ -837,7 +837,9 @@ static struct class rfkill_class = {
.dev_release = rfkill_release, .dev_release = rfkill_release,
.dev_groups = rfkill_dev_groups, .dev_groups = rfkill_dev_groups,
.dev_uevent = rfkill_dev_uevent, .dev_uevent = rfkill_dev_uevent,
#ifdef CONFIG_RFKILL_PM
.pm = RFKILL_PM_OPS, .pm = RFKILL_PM_OPS,
#endif
}; };
bool rfkill_blocked(struct rfkill *rfkill) bool rfkill_blocked(struct rfkill *rfkill)