rt2x00: remove hardware button support

PATCH New Ivo van Doorn 1 participant 1 message Sep 21, 2006

Subsystems (3)

Networking Network drivers Networking drivers (wireless)

lore

Share & tools

lore

Ivo van Doorn

author

2006-09-21 18:29 UTC #0 lore raw

PATCH 1/1 rt2x00: remove hardware button support

compilation was broken in rt2x00 due to rfkill attributed sneaking into rt2x00dev structure. rfkill will replace current hardware button support evantually, but lets fix rt2x00 compilation and remove hardware button support for this time until rfkill has been finished.

Signed-off-by Ivo van Doorn <[email protected]>

---

drivers/net/wireless/d80211/rt2x00/Kconfig +0 ~~-27~~

diff -rU3 wireless-dev/drivers/net/wireless/d80211/rt2x00/Kconfig wireless-dev-rfkill/drivers/net/wireless/d80211/rt2x00/Kconfig
@@ -15,15 +15,6 @@
 
 	When compiled as a module, this driver will be called "rt2400pci.ko".
 
-config RT2400PCI_BUTTON
-	bool "Ralink rt2400 hardware button support"
-	depends on RT2400PCI && X86
-	---help---
-	In some notebooks the rt2400 chipset is integrated in the machine,
-	with this option enabled the device will periodically poll the
-	the status of this button and will send and ACPI event when
-	the button has been pressed.
-
 config RT2400PCI_DEBUG
 	bool "Ralink rt2400 debug output"
 	depends on RT2400PCI

@@ -38,15 +29,6 @@
 
 	When compiled as a module, this driver will be called "rt2500pci.ko".
 
-config RT2500PCI_BUTTON
-	bool "Ralink rt2500 hardware button support"
-	depends on RT2500PCI && X86
-	---help---
-	In some notebooks the rt2500 chipset is integrated in the machine,
-	with this option enabled the device will periodically poll the
-	the status of this button and will send and ACPI event when
-	the button has been pressed.
-
 config RT2500PCI_DEBUG
 	bool "Ralink rt2500 debug output"
 	depends on RT2500PCI

@@ -61,15 +43,6 @@
 
 	When compiled as a module, this driver will be called "rt61pci.ko".
 
-config RT61PCI_BUTTON
-	bool "Ralink rt61 hardware button support"
-	depends on RT61PCI && X86
-	---help---
-	In some notebooks the rt61 chipset is integrated in the machine,
-	with this option enabled the device will periodically poll the
-	the status of this button and will send and ACPI event when
-	the button has been pressed.
-
 config RT61PCI_DEBUG
 	bool "Ralink rt61 debug output"
 	depends on RT61PCI

drivers/net/wireless/d80211/rt2x00/rt2400pci.c +0 ~~-36~~

diff -rU3 wireless-dev/drivers/net/wireless/d80211/rt2x00/rt2400pci.c wireless-dev-rfkill/drivers/net/wireless/d80211/rt2x00/rt2400pci.c
@@ -51,10 +51,6 @@
 #define CONFIG_RT2X00_DEBUG
 #endif /* CONFIG_RT2400PCI_DEBUG */
 
-#ifdef CONFIG_RT2400PCI_BUTTON
-#define CONFIG_RT2X00_BUTTON
-#endif /* CONFIG_RT2400PCI_BUTTON */
-
 #include "rt2x00.h"
 #include "rt2x00pci.h"
 #include "rt2400pci.h"

@@ -346,23 +342,6 @@
 		rt2x00_eeprom_read(rt2x00dev, word + i, data++);
 }
 
-#ifdef CONFIG_RT2400PCI_BUTTON
-/*
- * Hardware button poll handler.
- */
-static void rt2400pci_button_poll(unsigned long data)
-{
-	struct rt2x00_dev *rt2x00dev = (struct rt2x00_dev*)data;
-	u32 reg;
-
-	rt2x00_register_read(rt2x00dev, GPIOCSR, &reg);
-	rt2x00pci_button_status(
-		rt2x00dev, rt2x00_get_field32(reg, GPIOCSR_BIT0));
-}
-#else /* CONFIG_RT2400PCI_BUTTON */
-static void rt2400pci_button_poll(unsigned long data){}
-#endif /* CONFIG_RT2400PCI_BUTTON */
-
 /*
  * Ethtool handlers.
  */

@@ -2750,11 +2729,6 @@
 	struct rt2x00_dev *rt2x00dev = ieee80211_dev_hw_data(net_dev);
 
 	/*
-	 * Shutdown poll_timer for hardware button.
-	 */
-	rt2x00pci_button_stop(rt2x00dev);
-
-	/*
 	 * Free ring structures.
 	 */
 	kfree(rt2x00dev->ring);

@@ -2838,11 +2812,6 @@
 		goto exit;
 	}
 
-	/*
-	 * If required start hardware button polling.
-	 */
-	rt2x00pci_button_start(rt2x00dev, rt2400pci_button_poll);
-
 	return 0;
 
 exit:

@@ -3048,11 +3017,6 @@
 MODULE_PARM_DESC(debug, "Set this parameter to 1 to enable debug output.");
 #endif /* CONFIG_RT2400PCI_DEBUG */
 
-#ifdef CONFIG_RT2400PCI_BUTTON
-module_param_named(poll_delay, rt2x00_poll_delay, short, S_IRUGO);
-MODULE_PARM_DESC(debug, "Delay between WiFi button pollings (in 100ms).");
-#endif /* CONFIG_RT2400PCI_BUTTON */
-
 static struct pci_driver rt2400pci_driver = {
 	.name		= DRV_NAME,
 	.id_table	= rt2400pci_device_table,

drivers/net/wireless/d80211/rt2x00/rt2500pci.c +0 ~~-36~~

diff -rU3 wireless-dev/drivers/net/wireless/d80211/rt2x00/rt2500pci.c wireless-dev-rfkill/drivers/net/wireless/d80211/rt2x00/rt2500pci.c
@@ -51,10 +51,6 @@
 #define CONFIG_RT2X00_DEBUG
 #endif /* CONFIG_RT2500PCI_DEBUG */
 
-#ifdef CONFIG_RT2500PCI_BUTTON
-#define CONFIG_RT2X00_BUTTON
-#endif /* CONFIG_RT2500PCI_BUTTON */
-
 #include "rt2x00.h"
 #include "rt2x00pci.h"
 #include "rt2500pci.h"

@@ -346,23 +342,6 @@
 		rt2x00_eeprom_read(rt2x00dev, word + i, data++);
 }
 
-#ifdef CONFIG_RT2500PCI_BUTTON
-/*
- * Hardware button poll handler.
- */
-static void rt2500pci_button_poll(unsigned long data)
-{
-	struct rt2x00_dev *rt2x00dev = (struct rt2x00_dev*)data;
-	u32 reg;
-
-	rt2x00_register_read(rt2x00dev, GPIOCSR, &reg);
-	rt2x00pci_button_status(
-		rt2x00dev, rt2x00_get_field32(reg, GPIOCSR_BIT0));
-}
-#else /* CONFIG_RT2500PCI_BUTTON */
-static void rt2500pci_button_poll(unsigned long data){}
-#endif /* CONFIG_RT2500PCI_BUTTON */
-
 /*
  * Ethtool handlers.
  */

@@ -3035,11 +3014,6 @@
 	struct rt2x00_dev *rt2x00dev = ieee80211_dev_hw_data(net_dev);
 
 	/*
-	 * Shutdown poll_timer for hardware button.
-	 */
-	rt2x00pci_button_stop(rt2x00dev);
-
-	/*
 	 * Free ring structures.
 	 */
 	kfree(rt2x00dev->ring);

@@ -3123,11 +3097,6 @@
 		goto exit;
 	}
 
-	/*
-	 * If required start hardware button polling.
-	 */
-	rt2x00pci_button_start(rt2x00dev, rt2500pci_button_poll);
-
 	return 0;
 
 exit:

@@ -3333,11 +3302,6 @@
 MODULE_PARM_DESC(debug, "Set this parameter to 1 to enable debug output.");
 #endif /* CONFIG_RT2500PCI_DEBUG */
 
-#ifdef CONFIG_RT2500PCI_BUTTON
-module_param_named(poll_delay, rt2x00_poll_delay, short, S_IRUGO);
-MODULE_PARM_DESC(debug, "Delay between WiFi button pollings (in 100ms).");
-#endif /* CONFIG_RT2500PCI_BUTTON */
-
 static struct pci_driver rt2500pci_driver = {
 	.name		= DRV_NAME,
 	.id_table	= rt2500pci_device_table,

drivers/net/wireless/d80211/rt2x00/rt2x00.h +0 -8

diff -rU3 wireless-dev/drivers/net/wireless/d80211/rt2x00/rt2x00.h wireless-dev-rfkill/drivers/net/wireless/d80211/rt2x00/rt2x00.h
@@ -866,14 +866,6 @@
 	struct ieee80211_hw hw;
 
 	/*
-	 * If enabled, the structure for the
-	 * hardware button control.
-	 */
-#ifdef CONFIG_RT2X00_BUTTON
-	struct rfkill rfkill;
-#endif /* CONFIG_RT2X00_BUTTON */
-
-	/*
 	 * Queue for deferred work.
 	 */
 	struct workqueue_struct *workqueue;

drivers/net/wireless/d80211/rt2x00/rt2x00pci.h +0 ~~-111~~

115 lines not on this page · raw message

drivers/net/wireless/d80211/rt2x00/rt61pci.c +0 ~~-36~~

diff -rU3 wireless-dev/drivers/net/wireless/d80211/rt2x00/rt61pci.c wireless-dev-rfkill/drivers/net/wireless/d80211/rt2x00/rt61pci.c
@@ -52,10 +52,6 @@
 #define CONFIG_RT2X00_DEBUG
 #endif /* CONFIG_RT61PCI_DEBUG */
 
-#ifdef CONFIG_RT61PCI_BUTTON
-#define CONFIG_RT2X00_BUTTON
-#endif /* CONFIG_RT61PCI_BUTTON */
-
 #include "rt2x00.h"
 #include "rt2x00pci.h"
 #include "rt2x00crc.h"

@@ -377,23 +373,6 @@
 		rt2x00_eeprom_read(rt2x00dev, word + i, data++);
 }
 
-#ifdef CONFIG_RT61PCI_BUTTON
-/*
- * Hardware button poll handler.
- */
-static void rt61pci_button_poll(unsigned long data)
-{
-	struct rt2x00_dev *rt2x00dev = (struct rt2x00_dev*)data;
-	u32 reg;
-
-	rt2x00_register_read(rt2x00dev, MAC_CSR13, &reg);
-	rt2x00pci_button_status(
-		rt2x00dev, rt2x00_get_field32(reg, MAC_CSR13_BIT5));
-}
-#else /* CONFIG_RT61PCI_BUTTON */
-static void rt61pci_button_poll(unsigned long data){}
-#endif /* CONFIG_RT61PCI_BUTTON */
-
 /*
  * Ethtool handlers.
  */

@@ -3547,11 +3526,6 @@
 	struct rt2x00_dev *rt2x00dev = ieee80211_dev_hw_data(net_dev);
 
 	/*
-	 * Shutdown poll_timer for hardware button.
-	 */
-	rt2x00pci_button_stop(rt2x00dev);
-
-	/*
 	 * Free ring structures.
 	 */
 	kfree(rt2x00dev->ring);

@@ -3640,11 +3614,6 @@
 		goto exit;
 	}
 
-	/*
-	 * If required start hardware button polling.
-	 */
-	rt2x00pci_button_start(rt2x00dev, rt61pci_button_poll);
-
 	return 0;
 
 exit:

@@ -3856,11 +3825,6 @@
 MODULE_PARM_DESC(debug, "Set this parameter to 1 to enable debug output.");
 #endif /* CONFIG_RT61PCI_DEBUG */
 
-#ifdef CONFIG_RT61PCI_BUTTON
-module_param_named(poll_delay, rt2x00_poll_delay, short, S_IRUGO);
-MODULE_PARM_DESC(debug, "Delay between WiFi button pollings (in 100ms).");
-#endif /* CONFIG_RT61PCI_BUTTON */
-
 static struct pci_driver rt61pci_driver = {
 	.name		= DRV_NAME,
 	.id_table	= rt61pci_device_table,