Commit f5c4ae07 authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: make LED trigger names const 



This is just a code cleanup, make the LED trigger names const
as they're not expected to be modified by drivers.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 56ff5108

drivers/net/wireless/ath/ath5k/led.c

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ ath5k_led_brightness_set(struct led_classdev *led_dev, 


static int

ath5k_register_led(struct ath5k_hw *ah, struct ath5k_led *led,

		   const char *name, char *trigger)

		   const char *name, const char *trigger)

{

	int err;

drivers/net/wireless/ath/carl9170/led.c

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ static void carl9170_led_set_brightness(struct led_classdev *led, 
}



static int carl9170_led_register_led(struct ar9170 *ar, int i, char *name,

				     char *trigger)

				     const char *trigger)

{

	int err;

drivers/net/wireless/p54/led.c

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ static void p54_led_brightness_set(struct led_classdev *led_dev, 


static int p54_register_led(struct p54_common *priv,

			    unsigned int led_index,

			    char *name, char *trigger)

			    char *name, const char *trigger)

{

	struct p54_led_dev *led = &priv->leds[led_index];

	int err;

include/net/mac80211.h

+14 −13
Original line number Diff line number Diff line
@@ -3486,11 +3486,12 @@ enum ieee80211_tpt_led_trigger_flags { 
};



#ifdef CONFIG_MAC80211_LEDS

char *__ieee80211_get_tx_led_name(struct ieee80211_hw *hw);

char *__ieee80211_get_rx_led_name(struct ieee80211_hw *hw);

char *__ieee80211_get_assoc_led_name(struct ieee80211_hw *hw);

char *__ieee80211_get_radio_led_name(struct ieee80211_hw *hw);

char *__ieee80211_create_tpt_led_trigger(struct ieee80211_hw *hw,

const char *__ieee80211_get_tx_led_name(struct ieee80211_hw *hw);

const char *__ieee80211_get_rx_led_name(struct ieee80211_hw *hw);

const char *__ieee80211_get_assoc_led_name(struct ieee80211_hw *hw);

const char *__ieee80211_get_radio_led_name(struct ieee80211_hw *hw);

const char *

__ieee80211_create_tpt_led_trigger(struct ieee80211_hw *hw,

				   unsigned int flags,

				   const struct ieee80211_tpt_blink *blink_table,

				   unsigned int blink_table_len);
@@ -3507,7 +3508,7 @@ char *__ieee80211_create_tpt_led_trigger(struct ieee80211_hw *hw, 
 *

 * Return: The name of the LED trigger. %NULL if not configured for LEDs.

 */

static inline char *ieee80211_get_tx_led_name(struct ieee80211_hw *hw)

static inline const char *ieee80211_get_tx_led_name(struct ieee80211_hw *hw)

{

#ifdef CONFIG_MAC80211_LEDS

	return __ieee80211_get_tx_led_name(hw);
@@ -3528,7 +3529,7 @@ static inline char *ieee80211_get_tx_led_name(struct ieee80211_hw *hw) 
 *

 * Return: The name of the LED trigger. %NULL if not configured for LEDs.

 */

static inline char *ieee80211_get_rx_led_name(struct ieee80211_hw *hw)

static inline const char *ieee80211_get_rx_led_name(struct ieee80211_hw *hw)

{

#ifdef CONFIG_MAC80211_LEDS

	return __ieee80211_get_rx_led_name(hw);
@@ -3549,7 +3550,7 @@ static inline char *ieee80211_get_rx_led_name(struct ieee80211_hw *hw) 
 *

 * Return: The name of the LED trigger. %NULL if not configured for LEDs.

 */

static inline char *ieee80211_get_assoc_led_name(struct ieee80211_hw *hw)

static inline const char *ieee80211_get_assoc_led_name(struct ieee80211_hw *hw)

{

#ifdef CONFIG_MAC80211_LEDS

	return __ieee80211_get_assoc_led_name(hw);
@@ -3570,7 +3571,7 @@ static inline char *ieee80211_get_assoc_led_name(struct ieee80211_hw *hw) 
 *

 * Return: The name of the LED trigger. %NULL if not configured for LEDs.

 */

static inline char *ieee80211_get_radio_led_name(struct ieee80211_hw *hw)

static inline const char *ieee80211_get_radio_led_name(struct ieee80211_hw *hw)

{

#ifdef CONFIG_MAC80211_LEDS

	return __ieee80211_get_radio_led_name(hw);
@@ -3591,7 +3592,7 @@ static inline char *ieee80211_get_radio_led_name(struct ieee80211_hw *hw) 
 *

 * Note: This function must be called before ieee80211_register_hw().

 */

static inline char *

static inline const char *

ieee80211_create_tpt_led_trigger(struct ieee80211_hw *hw, unsigned int flags,

				 const struct ieee80211_tpt_blink *blink_table,

				 unsigned int blink_table_len)

net/mac80211/led.c

+9 −8
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ void ieee80211_led_exit(struct ieee80211_local *local) 
	}

}



char *__ieee80211_get_radio_led_name(struct ieee80211_hw *hw)

const char *__ieee80211_get_radio_led_name(struct ieee80211_hw *hw)

{

	struct ieee80211_local *local = hw_to_local(hw);
@@ -141,7 +141,7 @@ char *__ieee80211_get_radio_led_name(struct ieee80211_hw *hw) 
}

EXPORT_SYMBOL(__ieee80211_get_radio_led_name);



char *__ieee80211_get_assoc_led_name(struct ieee80211_hw *hw)

const char *__ieee80211_get_assoc_led_name(struct ieee80211_hw *hw)

{

	struct ieee80211_local *local = hw_to_local(hw);
@@ -149,7 +149,7 @@ char *__ieee80211_get_assoc_led_name(struct ieee80211_hw *hw) 
}

EXPORT_SYMBOL(__ieee80211_get_assoc_led_name);



char *__ieee80211_get_tx_led_name(struct ieee80211_hw *hw)

const char *__ieee80211_get_tx_led_name(struct ieee80211_hw *hw)

{

	struct ieee80211_local *local = hw_to_local(hw);
@@ -157,7 +157,7 @@ char *__ieee80211_get_tx_led_name(struct ieee80211_hw *hw) 
}

EXPORT_SYMBOL(__ieee80211_get_tx_led_name);



char *__ieee80211_get_rx_led_name(struct ieee80211_hw *hw)

const char *__ieee80211_get_rx_led_name(struct ieee80211_hw *hw)

{

	struct ieee80211_local *local = hw_to_local(hw);
@@ -211,7 +211,8 @@ static void tpt_trig_timer(unsigned long data) 
	read_unlock(&tpt_trig->trig.leddev_list_lock);

}



char *__ieee80211_create_tpt_led_trigger(struct ieee80211_hw *hw,

const char *

__ieee80211_create_tpt_led_trigger(struct ieee80211_hw *hw,

				   unsigned int flags,

				   const struct ieee80211_tpt_blink *blink_table,

				   unsigned int blink_table_len)