ath9k and ath9k_htc: rename variable "led_blink"

ath9k and ath9k_htc use the variable name "led_blink" to indicate whether the module parameter "blink" is on. This name is easy to conflict with other variables, and has caused a compiler error found by kbuild test bot. The compiler error is as following:

drivers/net/wireless/ath/ath9k/ath9k_htc.o:(.data+0x47c): multiple definition of `led_blink' drivers/net/wireless/ath/ath9k/ath9k.o:(.bss+0x20): first defined here

Fixes 3a939a671225 ("ath9k_htc: Add a module parameter to disable blink")

Reported-by kbuild test robot <[email protected]>

Signed-off-by Hong Xu <[email protected]>

---
Compared to previous versions, the commit message is improved to fit the contribution guideline (again).
---

 drivers/net/wireless/ath/ath9k/ath9k.h        | 2 +-
 drivers/net/wireless/ath/ath9k/gpio.c         | 2 +-
 drivers/net/wireless/ath/ath9k/htc.h          | 2 +-
 drivers/net/wireless/ath/ath9k/htc_drv_gpio.c | 2 +-
 drivers/net/wireless/ath/ath9k/htc_drv_init.c | 4 ++--
 drivers/net/wireless/ath/ath9k/init.c         | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)

drivers/net/wireless/ath/ath9k/ath9k.h +1 -1

index 1a9fe09..e84b576 100644
@@ -34,7 +34,7 @@ struct ath_vif;
 
 extern struct ieee80211_ops ath9k_ops;
 extern int ath9k_modparam_nohwcrypt;
-extern int led_blink;
+extern int ath9k_led_blink;
 extern bool is_ath9k_unloaded;
 extern int ath9k_use_chanctx;
 

drivers/net/wireless/ath/ath9k/gpio.c +1 -1

index 2fef7a4..da344b2 100644
@@ -49,7 +49,7 @@ void ath_init_leds(struct ath_softc *sc)
        if (AR_SREV_9100(sc->sc_ah))
                return;
 
-       if (!led_blink)
+       if (!ath9k_led_blink)
                sc->led_cdev.default_trigger =
                        ieee80211_get_radio_led_name(sc->hw);
 

drivers/net/wireless/ath/ath9k/htc.h +1 -1

index c43fec5..300d367 100644
@@ -45,7 +45,7 @@
 extern struct ieee80211_ops ath9k_htc_ops;
 extern int htc_modparam_nohwcrypt;
 #ifdef CONFIG_MAC80211_LEDS
-extern int led_blink;
+extern int ath9k_htc_led_blink;
 #endif
 
 enum htc_phymode {

drivers/net/wireless/ath/ath9k/htc_drv_gpio.c +1 -1

index 998b558..2aabcbd 100644
@@ -279,7 +279,7 @@ void ath9k_init_leds(struct ath9k_htc_priv *priv)
        else
                priv->ah->led_pin = ATH_LED_PIN_DEF;
 
-       if (!led_blink)
+       if (!ath9k_htc_led_blink)
                priv->led_cdev.default_trigger =
                        ieee80211_get_radio_led_name(priv->hw);
 

drivers/net/wireless/ath/ath9k/htc_drv_init.c +2 -2

index 9470127..fd22940 100644
@@ -39,8 +39,8 @@ module_param_named(ps_enable, ath9k_ps_enable, int, 0444);
 MODULE_PARM_DESC(ps_enable, "Enable WLAN PowerSave");
 
 #ifdef CONFIG_MAC80211_LEDS
-int led_blink = 1;
-module_param_named(blink, led_blink, int, 0444);
+int ath9k_htc_led_blink = 1;
+module_param_named(blink, ath9k_htc_led_blink, int, 0444);
 MODULE_PARM_DESC(blink, "Enable LED blink on activity");
 
 static const struct ieee80211_tpt_blink ath9k_htc_tpt_blink[] = {

drivers/net/wireless/ath/ath9k/init.c +2 -3

index d1c3934..2aef14e 100644
@@ -45,8 +45,8 @@ int ath9k_modparam_nohwcrypt;
 module_param_named(nohwcrypt, ath9k_modparam_nohwcrypt, int, 0444);
 MODULE_PARM_DESC(nohwcrypt, "Disable hardware encryption");
 
-int led_blink;
-module_param_named(blink, led_blink, int, 0444);
+int ath9k_led_blink;
+module_param_named(blink, ath9k_led_blink, int, 0444);
 MODULE_PARM_DESC(blink, "Enable LED blink on activity");
 
 static int ath9k_btcoex_enable;
--

2.2.2

--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Quoted 8 lines · Hong Xu

ath9k and ath9k_htc use the variable name "led_blink" to indicate whether the module parameter "blink" is on. This name is easy to conflict with other variables, and has caused a compiler error found by kbuild test bot. The compiler error is as following:

drivers/net/wireless/ath/ath9k/ath9k_htc.o:(.data+0x47c): multiple definition of `led_blink' drivers/net/wireless/ath/ath9k/ath9k.o:(.bss+0x20): first defined here

Quoted 7 lines

Fixes 3a939a671225 ("ath9k_htc: Add a module parameter to disable blink")

Reported-by kbuild test robot <[email protected]>

Signed-off-by Hong Xu <[email protected]>

---
Compared to previous versions, the commit message is improved to fit the contribution guideline (again).
---

This looks good.

I have one thing for followers of (linux-wireless) mailing-lists in general. If your patch is against a special Git tree, please add a "subject-prefix" and/or put a note in the commit-body. For example:
"This patch is against wireless-drivers-next or linux-next (next-2015-01-23)." This is very helpful.

Quoted 17 lines · Sedat Dilek

Quoted 8 lines · Hong Xu

ath9k and ath9k_htc use the variable name "led_blink" to indicate whether the module parameter "blink" is on. This name is easy to conflict with other variables, and has caused a compiler error found by kbuild test bot. The compiler error is as following:

drivers/net/wireless/ath/ath9k/ath9k_htc.o:(.data+0x47c): multiple definition of `led_blink' drivers/net/wireless/ath/ath9k/ath9k.o:(.bss+0x20): first defined here

Quoted 7 lines

Fixes 3a939a671225 ("ath9k_htc: Add a module parameter to disable blink")

Reported-by kbuild test robot <[email protected]>

Signed-off-by Hong Xu <[email protected]>

---
Compared to previous versions, the commit message is improved to fit the contribution guideline (again).
---

Quoted 1 line

This looks good.

Indeed.

Quoted 5 lines

I have one thing for followers of (linux-wireless) mailing-lists in general. If your patch is against a special Git tree, please add a "subject-prefix" and/or put a note in the commit-body. For example:
"This patch is against wireless-drivers-next or linux-next (next-2015-01-23)." This is very helpful.

I don't think that's necessary as by default driver patches go to wireless-drivers-next. But if the patch should go to an -rc release for whatever (good) reasons it's best to mark the patch like "[PATCH 3.19]" or similar, that way I can easily see that it should go to 3.19. Larry does that and it's really helpful.

Quoted 8 lines · Hong Xu

ath9k and ath9k_htc use the variable name "led_blink" to indicate whether the module parameter "blink" is on. This name is easy to conflict with other variables, and has caused a compiler error found by kbuild test bot. The compiler error is as following:

drivers/net/wireless/ath/ath9k/ath9k_htc.o:(.data+0x47c): multiple definition of `led_blink' drivers/net/wireless/ath/ath9k/ath9k.o:(.bss+0x20): first defined here

Quoted 7 lines

Fixes 3a939a671225 ("ath9k_htc: Add a module parameter to disable blink")

Reported-by kbuild test robot <[email protected]>

Signed-off-by Hong Xu <[email protected]>

---
Compared to previous versions, the commit message is improved to fit the contribution guideline (again).
---

This looks good.
( As said please have a look at [1]. )

I have one thing for followers of (linux-wireless) mailing-lists in general. If your patch is against a special Git tree, please add a "subject-prefix" and/or put a note in the commit-body.
For example: "This patch is against wireless-drivers-next or linux-next (next-2015-01-23)."
This is very helpful.
Think also of patches listed and downloadable from patchwork-service [2].

$ git format-patch --subject-prefix="PATCH wireless-drivers-next" ...

( Maybe w-d-n or w-d-next is a good abbreviation :-). )

- Sedat -

[1] http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Documentation/SubmittingPatches
[2] https://patchwork.kernel.org/project/linux-wireless/list/

ath9k and ath9k_htc use the variable name "led_blink" to indicate whether the module parameter "blink" is on. This name is easy to conflict with other variables, and has caused a compiler error found by kbuild test bot. The compiler error is as following:

drivers/net/wireless/ath/ath9k/ath9k_htc.o:(.data+0x47c): multiple definition of `led_blink' drivers/net/wireless/ath/ath9k/ath9k.o:(.bss+0x20): first defined here

Fixes 3a939a671225 ("ath9k_htc: Add a module parameter to disable blink")

Reported-by kbuild test robot <[email protected]>

Signed-off-by Hong Xu <[email protected]>