Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+5 -1
+2
include/uapi/linux/rfkill.h
··· 37 37 * @RFKILL_TYPE_WWAN: switch is on a wireless WAN device. 38 38 * @RFKILL_TYPE_GPS: switch is on a GPS device. 39 39 * @RFKILL_TYPE_FM: switch is on a FM radio device. 40 + * @RFKILL_TYPE_NFC: switch is on an NFC device. 40 41 * @NUM_RFKILL_TYPES: number of defined rfkill types 41 42 */ 42 43 enum rfkill_type { ··· 49 48 RFKILL_TYPE_WWAN, 50 49 RFKILL_TYPE_GPS, 51 50 RFKILL_TYPE_FM, 51 + RFKILL_TYPE_NFC, 52 52 NUM_RFKILL_TYPES, 53 53 }; 54 54
+3 -1
net/rfkill/core.c
··· 587 587 588 588 static const char *rfkill_get_type_str(enum rfkill_type type) 589 589 { 590 - BUILD_BUG_ON(NUM_RFKILL_TYPES != RFKILL_TYPE_FM + 1); 590 + BUILD_BUG_ON(NUM_RFKILL_TYPES != RFKILL_TYPE_NFC + 1); 591 591 592 592 switch (type) { 593 593 case RFKILL_TYPE_WLAN: ··· 604 604 return "gps"; 605 605 case RFKILL_TYPE_FM: 606 606 return "fm"; 607 + case RFKILL_TYPE_NFC: 608 + return "nfc"; 607 609 default: 608 610 BUG(); 609 611 }