From: Nick Pelly <npelly@google.com>
Date: Fri, 5 Dec 2008 01:37:05 +0000 (-0800)
Subject: rfkill: Introduce CONFIG_RFKILL_PM and use instead of CONFIG_PM to power down
X-Git-Tag: firefly_0821_release~11677
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3431d2fb2dc6e731081e1b7203953b63fe5ad373;p=firefly-linux-kernel-4.4.55.git

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>
---

diff --git a/net/rfkill/Kconfig b/net/rfkill/Kconfig
index eaf765876458..51f4baeede85 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 a001f7c1f711..c95475de2ceb 100644
--- a/net/rfkill/core.c
+++ b/net/rfkill/core.c
@@ -741,6 +741,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);
@@ -775,14 +776,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)