Ability to disable leds support. If leds support enabled do not force mac802.11 leds layer selection.

PATCH In review Dmytro Milinevskyy 2 participants 3 messages Jun 4, 2010 – Jun 7, 2010

Subsystems (3)

Networking Network drivers Atheros ATH5K wireless driver

lore

Share & tools

lore

Dmytro Milinevskyy

author

2010-06-04 13:43 UTC #0 lore raw

PATCH 1/1 Ability to disable leds support. If leds support enabled do not force mac802.11 leds layer selection.

Hi!

Here is the patch to disable ath5k leds support on build stage. However if the leds support was enabled do not force selection of 802.11 leds layer. Depency on LEDS_CLASS is kept.

Suggestion given by Pavel Roskin and Bob Copeland applied.

Regards,

--Dima

---
 drivers/net/wireless/ath/ath5k/Kconfig  |   12 +++++++++---
 drivers/net/wireless/ath/ath5k/Makefile |    2 +-
 drivers/net/wireless/ath/ath5k/ath5k.h  |   22 ++++++++++++++++++++++
 drivers/net/wireless/ath/ath5k/base.h   |   13 +++++++++----
 drivers/net/wireless/ath/ath5k/gpio.c   |    2 ++
 5 files changed, 43 insertions(+), 8 deletions(-)

drivers/net/wireless/ath/ath5k/Kconfig +9 -3

index eb83b7b..29f4572 100644
@@ -1,9 +1,6 @@
 config ATH5K
 	tristate "Atheros 5xxx wireless cards support"
 	depends on PCI && MAC80211
-	select MAC80211_LEDS
-	select LEDS_CLASS
-	select NEW_LEDS
 	---help---
 	  This module adds support for wireless adapters based on
 	  Atheros 5xxx chipset.

@@ -18,6 +15,15 @@ config ATH5K
 	  If you choose to build a module, it'll be called ath5k. Say M if
 	  unsure.
 
+
+config ATH5K_LEDS
+	tristate "Atheros 5xxx wireless cards LEDs support"
+	depends on ATH5K
+	select NEW_LEDS
+	select LEDS_CLASS
+	---help---
+	  Atheros 5xxx LED support.
+
 config ATH5K_DEBUG
 	bool "Atheros 5xxx debugging"
 	depends on ATH5K

drivers/net/wireless/ath/ath5k/Makefile +1 -1

index cc09595..6d552dd 100644
@@ -10,8 +10,8 @@ ath5k-y				+= phy.o
 ath5k-y				+= reset.o
 ath5k-y				+= attach.o
 ath5k-y				+= base.o
-ath5k-y				+= led.o
 ath5k-y				+= rfkill.o
 ath5k-y				+= ani.o
 ath5k-$(CONFIG_ATH5K_DEBUG)	+= debug.o
+ath5k-$(CONFIG_ATH5K_LEDS) += led.o
 obj-$(CONFIG_ATH5K)		+= ath5k.o

drivers/net/wireless/ath/ath5k/ath5k.h +22 -0

index 2785946..bb7e09a 100644
@@ -1148,11 +1148,27 @@ struct ath5k_hw {
 int ath5k_hw_attach(struct ath5k_softc *sc);
 void ath5k_hw_detach(struct ath5k_hw *ah);
 
+#ifdef CONFIG_ATH5K_LEDS
 /* LED functions */
 int ath5k_init_leds(struct ath5k_softc *sc);
 void ath5k_led_enable(struct ath5k_softc *sc);
 void ath5k_led_off(struct ath5k_softc *sc);
 void ath5k_unregister_leds(struct ath5k_softc *sc);
+#else
+static inline int ath5k_init_leds(struct ath5k_softc *sc)
+{
+	return 0;
+}
+static inline void ath5k_led_enable(struct ath5k_softc *sc)
+{
+}
+static inline void ath5k_led_off(struct ath5k_softc *sc)
+{
+}
+static inline void ath5k_unregister_leds(struct ath5k_softc *sc)
+{
+}
+#endif
 
 /* Reset Functions */
 int ath5k_hw_nic_wakeup(struct ath5k_hw *ah, int flags, bool initial);

@@ -1233,7 +1249,13 @@ int ath5k_hw_set_slot_time(struct ath5k_hw *ah, unsigned int slot_time);
 int ath5k_hw_init_desc_functions(struct ath5k_hw *ah);
 
 /* GPIO Functions */
+#ifdef CONFIG_ATH5K_LEDS
 void ath5k_hw_set_ledstate(struct ath5k_hw *ah, unsigned int state);
+#else
+static inline void ath5k_hw_set_ledstate(struct ath5k_hw *ah, unsigned int state)
+{
+}
+#endif
 int ath5k_hw_set_gpio_input(struct ath5k_hw *ah, u32 gpio);
 int ath5k_hw_set_gpio_output(struct ath5k_hw *ah, u32 gpio);
 u32 ath5k_hw_get_gpio(struct ath5k_hw *ah, u32 gpio);

drivers/net/wireless/ath/ath5k/base.h +9 -4

index 56221bc..97b26c1 100644
@@ -86,6 +86,7 @@ struct ath5k_txq {
 
 #define ATH5K_LED_MAX_NAME_LEN 31
 
+#ifdef CONFIG_ATH5K_LEDS
 /*
  * State for LED triggers
  */

@@ -95,6 +96,7 @@ struct ath5k_led
 	struct ath5k_softc *sc;			/* driver state */
 	struct led_classdev led_dev;		/* led classdev */
 };
+#endif
 
 /* Rfkill */
 struct ath5k_rfkill {

@@ -186,9 +188,6 @@ struct ath5k_softc {
 
 	u8			bssidmask[ETH_ALEN];
 
-	unsigned int		led_pin,	/* GPIO pin for driving LED */
-				led_on;		/* pin setting for LED on */
-
 	struct tasklet_struct	restq;		/* reset tasklet */
 
 	unsigned int		rxbufsize;	/* rx size based on mtu */

@@ -196,7 +195,6 @@ struct ath5k_softc {
 	spinlock_t		rxbuflock;
 	u32			*rxlink;	/* link ptr in last RX desc */
 	struct tasklet_struct	rxtq;		/* rx intr tasklet */
-	struct ath5k_led	rx_led;		/* rx led */
 
 	struct list_head	txbuf;		/* transmit buffer */
 	spinlock_t		txbuflock;

@@ -204,7 +202,14 @@ struct ath5k_softc {
 	struct ath5k_txq	txqs[AR5K_NUM_TX_QUEUES];	/* tx queues */
 	struct ath5k_txq	*txq;		/* main tx queue */
 	struct tasklet_struct	txtq;		/* tx intr tasklet */
+
+
+#ifdef CONFIG_ATH5K_LEDS
+	unsigned int		led_pin,	/* GPIO pin for driving LED */
+				led_on;		/* pin setting for LED on */
+	struct ath5k_led	rx_led;		/* rx led */
 	struct ath5k_led	tx_led;		/* tx led */
+#endif
 
 	struct ath5k_rfkill	rf_kill;

drivers/net/wireless/ath/ath5k/gpio.c +2 -0

index 64a27e7..9e757b3 100644
@@ -25,6 +25,7 @@
 #include "debug.h"
 #include "base.h"
 
+#ifdef CONFIG_ATH5K_LEDS
 /*
  * Set led state
  */

@@ -76,6 +77,7 @@ void ath5k_hw_set_ledstate(struct ath5k_hw *ah, unsigned int state)
 	else
 		AR5K_REG_ENABLE_BITS(ah, AR5K_PCICFG, led_5210);
 }
+#endif
 
 /*
  * Set GPIO inputs

Signature · 1 line

1.7.1

Pavel Roskin

2010-06-04 16:22 UTC #1 lore raw

Quoted 7 lines · Dmytro Milinevskyy

Hi!
Here is the patch to disable ath5k leds support on build stage. However if the leds support was enabled do not force selection of 802.11 leds layer. Depency on LEDS_CLASS is kept.
Suggestion given by Pavel Roskin and Bob Copeland applied.

It's great that you did it. The patch is much clearer now. That makes smaller issues visible. Please don't be discouraged by the criticism, you are on the right track.

First of all, your patch doesn't apply cleanly to the current wireless-testing because of formatting changes in Makefile. Please update.

drivers/net/wireless/ath/ath5k/Kconfig config ATH5K · line 25

Quoted 7 lines

drivers/net/wireless/ath/ath5k/Kconfig +7 -0

+config ATH5K_LEDS
+       tristate "Atheros 5xxx wireless cards LEDs support"
+       depends on ATH5K
+       select NEW_LEDS
+       select LEDS_CLASS
+       ---help---
+         Atheros 5xxx LED support.

"tristate" is wrong here. "tristate" would allow users select "m", which is wrong, since LED support is not a separate module. I think you want "bool" here.

drivers/net/wireless/ath/ath5k/base.h struct ath5k_led · line 99

Quoted 9 lines

drivers/net/wireless/ath/ath5k/base.h +2 -0

+#ifdef CONFIG_ATH5K_LEDS
 /*
  * State for LED triggers
  */

@@ -95,6 +96,7 @@ struct ath5k_led
 	struct ath5k_softc *sc;			/* driver state */
 	struct led_classdev led_dev;		/* led classdev */
 };
+#endif

This shouldn't be needed. I'll rather see a structure that is not used in some cases than an extra pair of preprocessor conditionals.

Quoted 13 lines

drivers/net/wireless/ath/ath5k/gpio.c +1 -0

index 64a27e7..9e757b3 100644
@@ -25,6 +25,7 @@
 #include "debug.h"
 #include "base.h"
 
+#ifdef CONFIG_ATH5K_LEDS
 /*
  * Set led state
  */

drivers/net/wireless/ath/ath5k/gpio.c void ath5k_hw_set_ledstate(struct ath5k_hw *ah, unsigned int state) · line 80

Quoted 4 lines

drivers/net/wireless/ath/ath5k/gpio.c +1 -0

@@ -76,6 +77,7 @@ void ath5k_hw_set_ledstate(struct ath5k_hw *ah, unsigned int state)
 	else
 		AR5K_REG_ENABLE_BITS(ah, AR5K_PCICFG, led_5210);
 }
+#endif

I would just move that function to led.c (and don't forget to include reg.h). The Makefile should take care of the rest.

Signature · 2 lines

Regards,
Pavel Roskin

Dmytro Milinevskyy

author

2010-06-07 07:39 UTC #2 lore raw

Pavel, thank you for the response here.

I agree with all your comments and will adjust the patch according to them.

I'm new to the submitting patches into the community and I appreciate telling criticism so that in future I will not cause that much troubles.

Regards,

-- Dima

Quoted 67 lines · Pavel Roskin

Quoted 7 lines · Dmytro Milinevskyy
Hi!
Here is the patch to disable ath5k leds support on build stage. However if the leds support was enabled do not force selection of 802.11 leds layer. Depency on LEDS_CLASS is kept.
Suggestion given by Pavel Roskin and Bob Copeland applied.
It's great that you did it. The patch is much clearer now. That makes smaller issues visible. Please don't be discouraged by the criticism, you are on the right track.
First of all, your patch doesn't apply cleanly to the current wireless-testing because of formatting changes in Makefile. Please update.
Quoted 7 lines
+config ATH5K_LEDS
+ tristate "Atheros 5xxx wireless cards LEDs support"
+ depends on ATH5K
+ select NEW_LEDS
+ select LEDS_CLASS
+ ---help---
+ Atheros 5xxx LED support.
"tristate" is wrong here. "tristate" would allow users select "m", which is wrong, since LED support is not a separate module. I think you want "bool" here.
Quoted 9 lines
+#ifdef CONFIG_ATH5K_LEDS
/*
* State for LED triggers
*/
(quoted diff) +0 -0
@@ -95,6 +96,7 @@ struct ath5k_led
struct ath5k_softc *sc; /* driver state */ struct led_classdev led_dev; /* led classdev */ };
+#endif
This shouldn't be needed. I'll rather see a structure that is not used in some cases than an extra pair of preprocessor conditionals.
Quoted 13 lines
drivers/net/wireless/ath/ath5k/gpio.c +1 -0
index 64a27e7..9e757b3 100644
@@ -25,6 +25,7 @@
  #include "debug.h"
  #include "base.h"
 
+#ifdef CONFIG_ATH5K_LEDS
  /*
   * Set led state
   */
@@ -76,6 +77,7 @@ void ath5k_hw_set_ledstate(struct ath5k_hw *ah, unsigned int state)
Quoted 4 lines
else
AR5K_REG_ENABLE_BITS(ah, AR5K_PCICFG, led_5210); }
+#endif
I would just move that function to led.c (and don't forget to include reg.h). The Makefile should take care of the rest.
--
Regards,
Pavel Roskin