openstlinux/linux-st
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[RFKILL]: Remove IRDA

Browse Source 
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>
This commit is contained in:
Ivo van Doorn
2007-09-13 09:20:42 +02:00
committed by David S. Miller
parent 077130c0cf
commit 234a0ca6f1
3 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/linux/rfkill.h
View File

@ -31,13 +31,11 @@
* enum rfkill_type - type of rfkill switch. * enum rfkill_type - type of rfkill switch.
* RFKILL_TYPE_WLAN: switch is no a Wireless network devices. * RFKILL_TYPE_WLAN: switch is no a Wireless network devices.
* RFKILL_TYPE_BlUETOOTH: switch is on a bluetooth device. * RFKILL_TYPE_BlUETOOTH: switch is on a bluetooth device.
* RFKILL_TYPE_IRDA: switch is on an infrared devices.
*/ */
enum rfkill_type { enum rfkill_type {
RFKILL_TYPE_WLAN = 0, RFKILL_TYPE_WLAN ,
RFKILL_TYPE_BLUETOOTH = 1, RFKILL_TYPE_BLUETOOTH,
RFKILL_TYPE_IRDA = 2, RFKILL_TYPE_MAX,
RFKILL_TYPE_MAX = 3,
}; };
enum rfkill_state { enum rfkill_state {

2
net/rfkill/Kconfig
View File

@ -5,7 +5,7 @@ menuconfig RFKILL
tristate "RF switch subsystem support" tristate "RF switch subsystem support"
help help
Say Y here if you want to have control over RF switches 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 To compile this driver as a module, choose M here: the
module will be called rfkill. module will be called rfkill.

5
net/rfkill/rfkill.c
View File

@ -106,9 +106,6 @@ static ssize_t rfkill_type_show(struct device *dev,
case RFKILL_TYPE_BLUETOOTH: case RFKILL_TYPE_BLUETOOTH:
type = "bluetooth"; type = "bluetooth";
break; break;
case RFKILL_TYPE_IRDA:
type = "irda";
break;
default: default:
BUG(); BUG();
} }
@ -281,7 +278,7 @@ static void rfkill_remove_switch(struct rfkill *rfkill)
/** /**
* rfkill_allocate - allocate memory for rfkill structure. * rfkill_allocate - allocate memory for rfkill structure.
* @parent: device that has rf switch on it * @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 * This function should be called by the network driver when it needs
* rfkill structure. Once the structure is allocated the driver shoud * rfkill structure. Once the structure is allocated the driver shoud