rfkill: Add missing description for RFKILL_TYPE_GPS
PATCH 1/2 rfkill: Add missing description for RFKILL_TYPE_GPS
Signed-off-by Marcel Holtmann <[email protected]>
--- include/linux/rfkill.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
include/linux/rfkill.h +1 -0
@@ -35,6 +35,7 @@* @RFKILL_TYPE_UWB: switch is on a ultra wideband 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. * @NUM_RFKILL_TYPES: number of defined rfkill types */ enum rfkill_type {
Signature · 1 line
1.6.3.3
PATCH 2/2 rfkill: Add constant for RFKILL_TYPE_FM radio devices
Signed-off-by Marcel Holtmann <[email protected]>
--- include/linux/rfkill.h | 2 ++ net/rfkill/core.c | 4 +++- 2 files changed, 5 insertions(+), 1 deletions(-)
include/linux/rfkill.h +2 -0
@@ -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_FM: switch is on a FM radio device. * @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_FM , NUM_RFKILL_TYPES, };
net/rfkill/core.c +3 -1
@@ -592,11 +592,13 @@ static const char *rfkill_get_type_str(enum rfkill_type type)return "wwan" ;case RFKILL_TYPE_GPS :return "gps" ; +case RFKILL_TYPE_FM : +return "fm" ;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,
Signature · 1 line
1.6.3.3
Both look good, thanks for short-circuiting the repost cycle :)
Acked-by Johannes Berg <[email protected]>
Not that I fully understand the need for either GPS or FM rfkill, but hey, whatever.
johannes
Quoted 17 lines · Marcel Holtmann
Signed-off-by Marcel Holtmann <[email protected]>--- include/linux/rfkill.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)include/linux/rfkill.h +1
-0@@ -35,6 +35,7 @@* @RFKILL_TYPE_UWB: switch is on a ultra wideband 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. * @NUM_RFKILL_TYPES: number of defined rfkill types */ enum rfkill_type {