[RFKILL]: Remove IRDA

As Dmitry pointed out earlier, rfkill-input.c
doesn't support irda because there are no users
and we shouldn't add unrequired KEY_ defines.

However, RFKILL_TYPE_IRDA was defined in the
rfkill.h header file and would confuse people
about whether it is implemented or not.

This patch removes IRDA support completely,
so it can be added whenever a driver wants the
feature.

Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/linux/rfkill.h b/include/linux/rfkill.h
index a8a6ea8..c4546e1 100644 (file)
--- a/include/linux/rfkill.h
+++ b/include/linux/rfkill.h
@@ -31,13 +31,11 @@
  * enum rfkill_type - type of rfkill switch.
  * RFKILL_TYPE_WLAN: switch is no a Wireless network devices.
  * RFKILL_TYPE_BlUETOOTH: switch is on a bluetooth device.
- * RFKILL_TYPE_IRDA: switch is on an infrared devices.
  */
 enum rfkill_type {
-       RFKILL_TYPE_WLAN = 0,
-       RFKILL_TYPE_BLUETOOTH = 1,
-       RFKILL_TYPE_IRDA = 2,
-       RFKILL_TYPE_MAX = 3,
+       RFKILL_TYPE_WLAN ,
+       RFKILL_TYPE_BLUETOOTH,
+       RFKILL_TYPE_MAX,
 };
 
 enum rfkill_state {

diff --git a/net/rfkill/Kconfig b/net/rfkill/Kconfig
index 8b31759..d28a6d9 100644 (file)
--- a/net/rfkill/Kconfig
+++ b/net/rfkill/Kconfig
@@ -5,7 +5,7 @@ menuconfig RFKILL
        tristate "RF switch subsystem support"
        help
          Say Y here if you want to have control over RF switches
-         found on many WiFi, Bluetooth and IRDA cards.
+         found on many WiFi and Bluetooth cards.
 
          To compile this driver as a module, choose M here: the
          module will be called rfkill.

diff --git a/net/rfkill/rfkill.c b/net/rfkill/rfkill.c
index db3395b..50e0102 100644 (file)
--- a/net/rfkill/rfkill.c
+++ b/net/rfkill/rfkill.c
@@ -106,9 +106,6 @@ static ssize_t rfkill_type_show(struct device *dev,
        case RFKILL_TYPE_BLUETOOTH:
                type = "bluetooth";
                break;
-       case RFKILL_TYPE_IRDA:
-               type = "irda";
-               break;
        default:
                BUG();
        }
@@ -281,7 +278,7 @@ static void rfkill_remove_switch(struct rfkill *rfkill)
 /**
  * rfkill_allocate - allocate memory for rfkill structure.
  * @parent: device that has rf switch on it
- * @type: type of the switch (wlan, bluetooth, irda)
+ * @type: type of the switch (RFKILL_TYPE_*)
  *
  * This function should be called by the network driver when it needs
  * rfkill structure. Once the structure is allocated the driver shoud