2009-01-29 19:29:48

by Danny Kukawka

[permalink] [raw]
Subject: [PATCH] fix led device naming for iwl driver

From: Danny Kukawka <[email protected]>
Subject: fix led device naming for iwl driver

Fixed led device naming for the iwl driver. Due to the
documentation of the led subsystem/class the naming should be
"devicename:colour:function" while not applying sections
should be left blank.

This should lead to e.g. "iwl-phy0::RX" instead of "iwl-phy0:RX".

Signed-off-by: Danny Kukawka <[email protected]>
--
iwl-led.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/wireless/iwlwifi/iwl-led.c b/drivers/net/wireless/iwlwifi/iwl-led.c
index 501cffe..249f4c7 100644
--- a/drivers/net/wireless/iwlwifi/iwl-led.c
+++ b/drivers/net/wireless/iwlwifi/iwl-led.c
@@ -352,7 +352,7 @@ int iwl_leds_register(struct iwl_priv *priv)

trigger = ieee80211_get_radio_led_name(priv->hw);
snprintf(priv->led[IWL_LED_TRG_RADIO].name,
- sizeof(priv->led[IWL_LED_TRG_RADIO].name), "iwl-%s:radio",
+ sizeof(priv->led[IWL_LED_TRG_RADIO].name), "iwl-%s::radio",
wiphy_name(priv->hw->wiphy));

priv->led[IWL_LED_TRG_RADIO].led_on = iwl4965_led_on_reg;
@@ -366,7 +366,7 @@ int iwl_leds_register(struct iwl_priv *priv)

trigger = ieee80211_get_assoc_led_name(priv->hw);
snprintf(priv->led[IWL_LED_TRG_ASSOC].name,
- sizeof(priv->led[IWL_LED_TRG_ASSOC].name), "iwl-%s:assoc",
+ sizeof(priv->led[IWL_LED_TRG_ASSOC].name), "iwl-%s::assoc",
wiphy_name(priv->hw->wiphy));

ret = iwl_leds_register_led(priv, &priv->led[IWL_LED_TRG_ASSOC],
@@ -382,7 +382,7 @@ int iwl_leds_register(struct iwl_priv *priv)

trigger = ieee80211_get_rx_led_name(priv->hw);
snprintf(priv->led[IWL_LED_TRG_RX].name,
- sizeof(priv->led[IWL_LED_TRG_RX].name), "iwl-%s:RX",
+ sizeof(priv->led[IWL_LED_TRG_RX].name), "iwl-%s::RX",
wiphy_name(priv->hw->wiphy));

ret = iwl_leds_register_led(priv, &priv->led[IWL_LED_TRG_RX],
@@ -397,7 +397,7 @@ int iwl_leds_register(struct iwl_priv *priv)

trigger = ieee80211_get_tx_led_name(priv->hw);
snprintf(priv->led[IWL_LED_TRG_TX].name,
- sizeof(priv->led[IWL_LED_TRG_TX].name), "iwl-%s:TX",
+ sizeof(priv->led[IWL_LED_TRG_TX].name), "iwl-%s::TX",
wiphy_name(priv->hw->wiphy));

ret = iwl_leds_register_led(priv, &priv->led[IWL_LED_TRG_TX],

--
Danny Kukawka
[email protected]
R&D Team Mobile Devices
SUSE LINUX a Novell Business
Maxfeldstr. 5, D-90409 Nuernberg, Germany
SUSE LINUX Products GmbH, Nuernberg; GF: Markus Rex, HRB 16746 (AG Nuernberg)


2009-01-29 19:38:23

by Reinette Chatre

[permalink] [raw]
Subject: Re: [PATCH] fix led device naming for iwl driver

On Thu, 2009-01-29 at 11:29 -0800, Danny Kukawka wrote:
> From: Danny Kukawka <[email protected]>
> Subject: fix led device naming for iwl driver
>
> Fixed led device naming for the iwl driver. Due to the
> documentation of the led subsystem/class the naming should be
> "devicename:colour:function" while not applying sections
> should be left blank.
>
> This should lead to e.g. "iwl-phy0::RX" instead of "iwl-phy0:RX".
>
> Signed-off-by: Danny Kukawka <[email protected]>

Sorry - I missed this in your original submission. The subject does not
identify iwlwifi. Subject could be:

iwlwifi: fix led naming

Looks good otherwise.

Acked-by: Reinette Chatre <[email protected]>


It may be easier for John if you resubmit with the correct subject - you
can just add my ack when you do.

Thanks

Reinette