rfkill: Add constant for RFKILL_TYPE_FM radio devices

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Janakiram Sistla <janakiram.sistla@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/include/linux/rfkill.h b/include/linux/rfkill.h
index a75e9e5..97059d0 100644 (file)
--- a/include/linux/rfkill.h
+++ b/include/linux/rfkill.h
@@ -36,6 +36,7 @@
  * @RFKILL_TYPE_WIMAX: switch is on a WiMAX device.
  * @RFKILL_TYPE_WWAN: switch is on a wireless WAN device.
  * @RFKILL_TYPE_GPS: switch is on a GPS device.
  * @RFKILL_TYPE_WIMAX: switch is on a WiMAX device.
  * @RFKILL_TYPE_WWAN: switch is on a wireless WAN device.
  * @RFKILL_TYPE_GPS: switch is on a GPS device.

+ * @RFKILL_TYPE_FM: switch is on a FM radio device.

  * @NUM_RFKILL_TYPES: number of defined rfkill types
  */
 enum rfkill_type {
  * @NUM_RFKILL_TYPES: number of defined rfkill types
  */
 enum rfkill_type {


@@ -46,6 +47,7 @@ enum rfkill_type {
        RFKILL_TYPE_WIMAX,
        RFKILL_TYPE_WWAN,
        RFKILL_TYPE_GPS,
        RFKILL_TYPE_WIMAX,
        RFKILL_TYPE_WWAN,
        RFKILL_TYPE_GPS,

+       RFKILL_TYPE_FM,

        NUM_RFKILL_TYPES,
 };
 
        NUM_RFKILL_TYPES,
 };
 

diff --git a/net/rfkill/core.c b/net/rfkill/core.c
index ba2efb9..09f4e16 100644 (file)
--- a/net/rfkill/core.c
+++ b/net/rfkill/core.c
@@ -592,11 +592,13 @@ static const char *rfkill_get_type_str(enum rfkill_type type)
                return "wwan";
        case RFKILL_TYPE_GPS:
                return "gps";
                return "wwan";
        case RFKILL_TYPE_GPS:
                return "gps";

+       case RFKILL_TYPE_FM:
+               return "fm";

        default:
                BUG();
        }
 
        default:
                BUG();
        }
 

-       BUILD_BUG_ON(NUM_RFKILL_TYPES != RFKILL_TYPE_GPS + 1);
+       BUILD_BUG_ON(NUM_RFKILL_TYPES != RFKILL_TYPE_FM + 1);

 }
 
 static ssize_t rfkill_type_show(struct device *dev,
 }
 
 static ssize_t rfkill_type_show(struct device *dev,