Commit 44b3decb authored Apr 11, 2013 by Samuel Ortiz

rfkill: Add NFC to the list of supported radios



And return the proper string for it.

Acked-by: Johannes Berg <johannes@sipsolutions.net>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

parent 60d9edd5

include/uapi/linux/rfkill.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -37,6 +37,7 @@
		* @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.
		* @RFKILL_TYPE_NFC: switch is on an NFC device.
		* @NUM_RFKILL_TYPES: number of defined rfkill types
		*/
		enum rfkill_type {
		@@ -48,6 +49,7 @@ enum rfkill_type {
		RFKILL_TYPE_WWAN,
		RFKILL_TYPE_GPS,
		RFKILL_TYPE_FM,
		RFKILL_TYPE_NFC,
		NUM_RFKILL_TYPES,
		};

net/rfkill/core.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -587,7 +587,7 @@ static ssize_t rfkill_name_show(struct device *dev,

		static const char *rfkill_get_type_str(enum rfkill_type type)
		{
		BUILD_BUG_ON(NUM_RFKILL_TYPES != RFKILL_TYPE_FM + 1);
		BUILD_BUG_ON(NUM_RFKILL_TYPES != RFKILL_TYPE_NFC + 1);

		switch (type) {
		case RFKILL_TYPE_WLAN:
		@@ -604,6 +604,8 @@ static const char *rfkill_get_type_str(enum rfkill_type type)
		return "gps";
		case RFKILL_TYPE_FM:
		return "fm";
		case RFKILL_TYPE_NFC:
		return "nfc";
		default:
		BUG();
		}