* [PATCH v4] ath9k and ath9k_htc: rename variable "led_blink"
@ 2015-01-24 11:34 Hong Xu
2015-01-24 11:51 ` Sedat Dilek
2015-01-27 18:06 ` [v4] " Kalle Valo
0 siblings, 2 replies; 6+ messages in thread
From: Hong Xu @ 2015-01-24 11:34 UTC (permalink / raw)
To: linux-wireless, kvalo; +Cc: 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
Fixes: 3a939a671225 ("ath9k_htc: Add a module parameter to disable blink")
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Hong Xu <hong@topbug.net>
---
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(-)
diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h
index 1a9fe09..e84b576 100644
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -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;
diff --git a/drivers/net/wireless/ath/ath9k/gpio.c b/drivers/net/wireless/ath/ath9k/gpio.c
index 2fef7a4..da344b2 100644
--- a/drivers/net/wireless/ath/ath9k/gpio.c
+++ b/drivers/net/wireless/ath/ath9k/gpio.c
@@ -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);
diff --git a/drivers/net/wireless/ath/ath9k/htc.h b/drivers/net/wireless/ath/ath9k/htc.h
index c43fec5..300d367 100644
--- a/drivers/net/wireless/ath/ath9k/htc.h
+++ b/drivers/net/wireless/ath/ath9k/htc.h
@@ -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 {
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_gpio.c b/drivers/net/wireless/ath/ath9k/htc_drv_gpio.c
index 998b558..2aabcbd 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_gpio.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_gpio.c
@@ -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);
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_init.c b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
index 9470127..fd22940 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
@@ -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[] = {
diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c
index d1c3934..2aef14e 100644
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
@@ -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
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH v4] ath9k and ath9k_htc: rename variable "led_blink"
2015-01-24 11:34 [PATCH v4] ath9k and ath9k_htc: rename variable "led_blink" Hong Xu
@ 2015-01-24 11:51 ` Sedat Dilek
2015-01-24 13:16 ` Kalle Valo
2015-01-26 3:09 ` Hong Xu
2015-01-27 18:06 ` [v4] " Kalle Valo
1 sibling, 2 replies; 6+ messages in thread
From: Sedat Dilek @ 2015-01-24 11:51 UTC (permalink / raw)
To: Hong Xu; +Cc: wireless, kvalo
On Sat, Jan 24, 2015 at 12:34 PM, Hong Xu <hong@topbug.net> wrote:
> 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 <fengguang.wu@intel.com>
> Signed-off-by: Hong Xu <hong@topbug.net>
> ---
> 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/
> 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(-)
>
> diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h
> index 1a9fe09..e84b576 100644
> --- a/drivers/net/wireless/ath/ath9k/ath9k.h
> +++ b/drivers/net/wireless/ath/ath9k/ath9k.h
> @@ -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;
>
> diff --git a/drivers/net/wireless/ath/ath9k/gpio.c b/drivers/net/wireless/ath/ath9k/gpio.c
> index 2fef7a4..da344b2 100644
> --- a/drivers/net/wireless/ath/ath9k/gpio.c
> +++ b/drivers/net/wireless/ath/ath9k/gpio.c
> @@ -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);
>
> diff --git a/drivers/net/wireless/ath/ath9k/htc.h b/drivers/net/wireless/ath/ath9k/htc.h
> index c43fec5..300d367 100644
> --- a/drivers/net/wireless/ath/ath9k/htc.h
> +++ b/drivers/net/wireless/ath/ath9k/htc.h
> @@ -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 {
> diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_gpio.c b/drivers/net/wireless/ath/ath9k/htc_drv_gpio.c
> index 998b558..2aabcbd 100644
> --- a/drivers/net/wireless/ath/ath9k/htc_drv_gpio.c
> +++ b/drivers/net/wireless/ath/ath9k/htc_drv_gpio.c
> @@ -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);
>
> diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_init.c b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
> index 9470127..fd22940 100644
> --- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c
> +++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
> @@ -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[] = {
> diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c
> index d1c3934..2aef14e 100644
> --- a/drivers/net/wireless/ath/ath9k/init.c
> +++ b/drivers/net/wireless/ath/ath9k/init.c
> @@ -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 majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH v4] ath9k and ath9k_htc: rename variable "led_blink"
2015-01-24 11:51 ` Sedat Dilek
@ 2015-01-24 13:16 ` Kalle Valo
2015-01-24 13:24 ` Sedat Dilek
2015-01-26 3:09 ` Hong Xu
1 sibling, 1 reply; 6+ messages in thread
From: Kalle Valo @ 2015-01-24 13:16 UTC (permalink / raw)
To: sedat.dilek; +Cc: Hong Xu, wireless
Sedat Dilek <sedat.dilek@gmail.com> writes:
> On Sat, Jan 24, 2015 at 12:34 PM, Hong Xu <hong@topbug.net> wrote:
>> 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 <fengguang.wu@intel.com>
>> Signed-off-by: Hong Xu <hong@topbug.net>
>> ---
>> Compared to previous versions, the commit message is improved to fit
>> the contribution guideline (again).
>> ---
>
> This looks good.
Indeed.
> 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.
--
Kalle Valo
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH v4] ath9k and ath9k_htc: rename variable "led_blink"
2015-01-24 13:16 ` Kalle Valo
@ 2015-01-24 13:24 ` Sedat Dilek
0 siblings, 0 replies; 6+ messages in thread
From: Sedat Dilek @ 2015-01-24 13:24 UTC (permalink / raw)
To: Kalle Valo; +Cc: Hong Xu, wireless
On Sat, Jan 24, 2015 at 2:16 PM, Kalle Valo <kvalo@codeaurora.org> wrote:
> Sedat Dilek <sedat.dilek@gmail.com> writes:
>
>> On Sat, Jan 24, 2015 at 12:34 PM, Hong Xu <hong@topbug.net> wrote:
>>> 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 <fengguang.wu@intel.com>
>>> Signed-off-by: Hong Xu <hong@topbug.net>
>>> ---
>>> Compared to previous versions, the commit message is improved to fit
>>> the contribution guideline (again).
>>> ---
>>
>> This looks good.
>
> Indeed.
>
>> 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.
>
OK, that is helpful for rc-fixes (and I used that).
But how to distinguish when this is not a rc-fix but for
wireless-drivers-next (to fix a breakage like here)... Label with
"[PATCH 3.20]"?
For you as a daily reader/follower this might be clear, but not for me
and maybe others.
Please, also look at netdev ML (patches for net.git/net-next.git).
- Sedat -
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v4] ath9k and ath9k_htc: rename variable "led_blink"
2015-01-24 11:51 ` Sedat Dilek
2015-01-24 13:16 ` Kalle Valo
@ 2015-01-26 3:09 ` Hong Xu
1 sibling, 0 replies; 6+ messages in thread
From: Hong Xu @ 2015-01-26 3:09 UTC (permalink / raw)
To: sedat.dilek; +Cc: wireless, kvalo
[-- Attachment #1: Type: text/plain, Size: 1697 bytes --]
Sedat Dilek <sedat.dilek@gmail.com> writes:
> On Sat, Jan 24, 2015 at 12:34 PM, Hong Xu <hong@topbug.net> wrote:
>> 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 <fengguang.wu@intel.com>
>> Signed-off-by: Hong Xu <hong@topbug.net>
>> ---
>> 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/
Thanks, Sedat. I'll be more careful next time :)
Hong
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 818 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [v4] ath9k and ath9k_htc: rename variable "led_blink"
2015-01-24 11:34 [PATCH v4] ath9k and ath9k_htc: rename variable "led_blink" Hong Xu
2015-01-24 11:51 ` Sedat Dilek
@ 2015-01-27 18:06 ` Kalle Valo
1 sibling, 0 replies; 6+ messages in thread
From: Kalle Valo @ 2015-01-27 18:06 UTC (permalink / raw)
To: Hong Xu; +Cc: linux-wireless, 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
>
> Fixes: 3a939a671225 ("ath9k_htc: Add a module parameter to disable blink")
> Reported-by: kbuild test robot <fengguang.wu@intel.com>
> Signed-off-by: Hong Xu <hong@topbug.net>
Thanks, applied to wireless-drivers-next.git.
Kalle Valo
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-01-27 18:06 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-01-24 11:34 [PATCH v4] ath9k and ath9k_htc: rename variable "led_blink" Hong Xu
2015-01-24 11:51 ` Sedat Dilek
2015-01-24 13:16 ` Kalle Valo
2015-01-24 13:24 ` Sedat Dilek
2015-01-26 3:09 ` Hong Xu
2015-01-27 18:06 ` [v4] " Kalle Valo
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.