Revert "rfkill: Introduce CONFIG_RFKILL_PM and use instead of CONFIG_PM to power...

This reverts commit 3431d2fb2dc6e731081e1b7203953b63fe5ad373.

diff --git a/net/rfkill/Kconfig b/net/rfkill/Kconfig
index 51f4baeede8502ed0e991c9434292df9736c0147..eaf765876458f3a89e5a26af5d5ac3b09c556161 100644 (file)
--- a/net/rfkill/Kconfig
+++ b/net/rfkill/Kconfig
@@ -10,11 +10,6 @@ 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 c95475de2ceb6ba8f99b329bd5ce48cf5a056c70..a001f7c1f71145b61eef6aaa7b6128a121751f6e 100644 (file)
--- a/net/rfkill/core.c
+++ b/net/rfkill/core.c
@@ -741,7 +741,6 @@ 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);
@@ -776,17 +775,14 @@ 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)