Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e47a5cdd authored by Ivo van Doorn's avatar Ivo van Doorn Committed by John W. Linville
Browse files

rt2x00: use wiphy rfkill interface 



Remove the input_polldev from rt2x00 and replace it with
the rfkill interface offered by the wiphy structure. This
simplifies the entire rfkill handling in rt2x00 and allows
us to remove the CONFIG_RT2X00_LIB_RFKILL option and always
enables rfkill capabilities.

Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent b623a9f7

drivers/net/wireless/rt2x00/Kconfig

+0 −8
Original line number Diff line number Diff line
@@ -112,14 +112,6 @@ config RT2X00_LIB_FIRMWARE 
config RT2X00_LIB_CRYPTO

	boolean



config RT2X00_LIB_RFKILL

	boolean

	default y if (RT2X00_LIB=y && INPUT=y) || (RT2X00_LIB=m && INPUT!=n)

	select INPUT_POLLDEV



comment "rt2x00 rfkill support disabled due to modularized INPUT and built-in rt2x00"

	depends on RT2X00_LIB=y && INPUT=m



config RT2X00_LIB_LEDS

	boolean

	default y if (RT2X00_LIB=y && LEDS_CLASS=y) || (RT2X00_LIB=m && LEDS_CLASS!=n)

drivers/net/wireless/rt2x00/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ rt2x00lib-y += rt2x00queue.o 
rt2x00lib-y				+= rt2x00link.o

rt2x00lib-$(CONFIG_RT2X00_LIB_DEBUGFS)	+= rt2x00debug.o

rt2x00lib-$(CONFIG_RT2X00_LIB_CRYPTO)	+= rt2x00crypto.o

rt2x00lib-$(CONFIG_RT2X00_LIB_RFKILL)	+= rt2x00rfkill.o

rt2x00lib-$(CONFIG_RT2X00_LIB_FIRMWARE)	+= rt2x00firmware.o

rt2x00lib-$(CONFIG_RT2X00_LIB_LEDS)	+= rt2x00leds.o

rt2x00lib-$(CONFIG_RT2X00_LIB_HT)	+= rt2x00ht.o

drivers/net/wireless/rt2x00/rt2400pci.c

+1 −6
Original line number Diff line number Diff line
@@ -199,7 +199,6 @@ static const struct rt2x00debug rt2400pci_rt2x00debug = { 
};

#endif /* CONFIG_RT2X00_LIB_DEBUGFS */



#ifdef CONFIG_RT2X00_LIB_RFKILL

static int rt2400pci_rfkill_poll(struct rt2x00_dev *rt2x00dev)

{

	u32 reg;
@@ -207,9 +206,6 @@ static int rt2400pci_rfkill_poll(struct rt2x00_dev *rt2x00dev) 
	rt2x00pci_register_read(rt2x00dev, GPIOCSR, &reg);

	return rt2x00_get_field32(reg, GPIOCSR_BIT0);

}

#else

#define rt2400pci_rfkill_poll	NULL

#endif /* CONFIG_RT2X00_LIB_RFKILL */



#ifdef CONFIG_RT2X00_LIB_LEDS

static void rt2400pci_brightness_set(struct led_classdev *led_cdev,
@@ -1391,10 +1387,8 @@ static int rt2400pci_init_eeprom(struct rt2x00_dev *rt2x00dev) 
	/*

	 * Detect if this device has an hardware controlled radio.

	 */

#ifdef CONFIG_RT2X00_LIB_RFKILL

	if (rt2x00_get_field16(eeprom, EEPROM_ANTENNA_HARDWARE_RADIO))

		__set_bit(CONFIG_SUPPORT_HW_BUTTON, &rt2x00dev->flags);

#endif /* CONFIG_RT2X00_LIB_RFKILL */



	/*

	 * Check if the BBP tuning should be enabled.
@@ -1573,6 +1567,7 @@ static const struct ieee80211_ops rt2400pci_mac80211_ops = { 
	.get_tx_stats		= rt2x00mac_get_tx_stats,

	.get_tsf		= rt2400pci_get_tsf,

	.tx_last_beacon		= rt2400pci_tx_last_beacon,

	.rfkill_poll		= rt2x00mac_rfkill_poll,

};



static const struct rt2x00lib_ops rt2400pci_rt2x00_ops = {

drivers/net/wireless/rt2x00/rt2500pci.c

+1 −6
Original line number Diff line number Diff line
@@ -199,7 +199,6 @@ static const struct rt2x00debug rt2500pci_rt2x00debug = { 
};

#endif /* CONFIG_RT2X00_LIB_DEBUGFS */



#ifdef CONFIG_RT2X00_LIB_RFKILL

static int rt2500pci_rfkill_poll(struct rt2x00_dev *rt2x00dev)

{

	u32 reg;
@@ -207,9 +206,6 @@ static int rt2500pci_rfkill_poll(struct rt2x00_dev *rt2x00dev) 
	rt2x00pci_register_read(rt2x00dev, GPIOCSR, &reg);

	return rt2x00_get_field32(reg, GPIOCSR_BIT0);

}

#else

#define rt2500pci_rfkill_poll	NULL

#endif /* CONFIG_RT2X00_LIB_RFKILL */



#ifdef CONFIG_RT2X00_LIB_LEDS

static void rt2500pci_brightness_set(struct led_classdev *led_cdev,
@@ -1548,10 +1544,8 @@ static int rt2500pci_init_eeprom(struct rt2x00_dev *rt2x00dev) 
	/*

	 * Detect if this device has an hardware controlled radio.

	 */

#ifdef CONFIG_RT2X00_LIB_RFKILL

	if (rt2x00_get_field16(eeprom, EEPROM_ANTENNA_HARDWARE_RADIO))

		__set_bit(CONFIG_SUPPORT_HW_BUTTON, &rt2x00dev->flags);

#endif /* CONFIG_RT2X00_LIB_RFKILL */



	/*

	 * Check if the BBP tuning should be enabled.
@@ -1872,6 +1866,7 @@ static const struct ieee80211_ops rt2500pci_mac80211_ops = { 
	.get_tx_stats		= rt2x00mac_get_tx_stats,

	.get_tsf		= rt2500pci_get_tsf,

	.tx_last_beacon		= rt2500pci_tx_last_beacon,

	.rfkill_poll		= rt2x00mac_rfkill_poll,

};



static const struct rt2x00lib_ops rt2500pci_rt2x00_ops = {

drivers/net/wireless/rt2x00/rt2500usb.c

+1 −6
Original line number Diff line number Diff line
@@ -277,7 +277,6 @@ static const struct rt2x00debug rt2500usb_rt2x00debug = { 
};

#endif /* CONFIG_RT2X00_LIB_DEBUGFS */



#ifdef CONFIG_RT2X00_LIB_RFKILL

static int rt2500usb_rfkill_poll(struct rt2x00_dev *rt2x00dev)

{

	u16 reg;
@@ -285,9 +284,6 @@ static int rt2500usb_rfkill_poll(struct rt2x00_dev *rt2x00dev) 
	rt2500usb_register_read(rt2x00dev, MAC_CSR19, &reg);

	return rt2x00_get_field32(reg, MAC_CSR19_BIT7);

}

#else

#define rt2500usb_rfkill_poll	NULL

#endif /* CONFIG_RT2X00_LIB_RFKILL */



#ifdef CONFIG_RT2X00_LIB_LEDS

static void rt2500usb_brightness_set(struct led_classdev *led_cdev,
@@ -1601,10 +1597,8 @@ static int rt2500usb_init_eeprom(struct rt2x00_dev *rt2x00dev) 
	/*

	 * Detect if this device has an hardware controlled radio.

	 */

#ifdef CONFIG_RT2X00_LIB_RFKILL

	if (rt2x00_get_field16(eeprom, EEPROM_ANTENNA_HARDWARE_RADIO))

		__set_bit(CONFIG_SUPPORT_HW_BUTTON, &rt2x00dev->flags);

#endif /* CONFIG_RT2X00_LIB_RFKILL */



	/*

	 * Check if the BBP tuning should be disabled.
@@ -1905,6 +1899,7 @@ static const struct ieee80211_ops rt2500usb_mac80211_ops = { 
	.bss_info_changed	= rt2x00mac_bss_info_changed,

	.conf_tx		= rt2x00mac_conf_tx,

	.get_tx_stats		= rt2x00mac_get_tx_stats,

	.rfkill_poll		= rt2x00mac_rfkill_poll,

};



static const struct rt2x00lib_ops rt2500usb_rt2x00_ops = {