[PATCH 14/31] net: wireless: ath: changing LED_* from enum led_brightness to actual value

[PATCH 14/31] net: wireless: ath: changing LED_* from enum led_brightness to actual value

[Luiz Sampaio]

The enum led_brightness, which contains the declaration of LED_OFF,
LED_ON, LED_HALF and LED_FULL is obsolete, as the led class now supports
max_brightness.
---
 drivers/net/wireless/ath/ath5k/led.c          | 2 +-
 drivers/net/wireless/ath/ath9k/gpio.c         | 4 ++--
 drivers/net/wireless/ath/ath9k/htc_drv_gpio.c | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/net/wireless/ath/ath5k/led.c b/drivers/net/wireless/ath/ath5k/led.c
index 33e9928af363..df3db4851bf3 100644
--- a/drivers/net/wireless/ath/ath5k/led.c
+++ b/drivers/net/wireless/ath/ath5k/led.c
@@ -118,7 +118,7 @@ ath5k_led_brightness_set(struct led_classdev *led_dev,
 	struct ath5k_led *led = container_of(led_dev, struct ath5k_led,
 		led_dev);
 
-	if (brightness == LED_OFF)
+	if (brightness == 0)
 		ath5k_led_off(led->ah);
 	else
 		ath5k_led_on(led->ah);
diff --git a/drivers/net/wireless/ath/ath9k/gpio.c b/drivers/net/wireless/ath/ath9k/gpio.c
index b457e52dd365..0828dc9d3503 100644
--- a/drivers/net/wireless/ath/ath9k/gpio.c
+++ b/drivers/net/wireless/ath/ath9k/gpio.c
@@ -52,7 +52,7 @@ static void ath_led_brightness(struct led_classdev *led_cdev,
 			       enum led_brightness brightness)
 {
 	struct ath_softc *sc = container_of(led_cdev, struct ath_softc, led_cdev);
-	u32 val = (brightness == LED_OFF);
+	u32 val = (brightness == 0);
 
 	if (sc->sc_ah->config.led_active_high)
 		val = !val;
@@ -65,7 +65,7 @@ void ath_deinit_leds(struct ath_softc *sc)
 	if (!sc->led_registered)
 		return;
 
-	ath_led_brightness(&sc->led_cdev, LED_OFF);
+	ath_led_brightness(&sc->led_cdev, 0);
 	led_classdev_unregister(&sc->led_cdev);
 
 	ath9k_hw_gpio_free(sc->sc_ah, sc->sc_ah->led_pin);
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_gpio.c b/drivers/net/wireless/ath/ath9k/htc_drv_gpio.c
index ecb848b60725..7a9369f06534 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_gpio.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_gpio.c
@@ -230,7 +230,7 @@ void ath9k_led_work(struct work_struct *work)
 						   led_work);
 
 	ath9k_hw_set_gpio(priv->ah, priv->ah->led_pin,
-			  (priv->brightness == LED_OFF));
+			  (priv->brightness == 0));
 }
 
 static void ath9k_led_brightness(struct led_classdev *led_cdev,
@@ -250,7 +250,7 @@ void ath9k_deinit_leds(struct ath9k_htc_priv *priv)
 	if (!priv->led_registered)
 		return;
 
-	ath9k_led_brightness(&priv->led_cdev, LED_OFF);
+	ath9k_led_brightness(&priv->led_cdev, 0);
 	led_classdev_unregister(&priv->led_cdev);
 	cancel_work_sync(&priv->led_work);
 
-- 
2.34.1

[PATCH 15/31] net: wireless: atmel: changing LED_* from enum led_brightness to actual value

[Luiz Sampaio]

The enum led_brightness, which contains the declaration of LED_OFF,
LED_ON, LED_HALF and LED_FULL is obsolete, as the led class now supports
max_brightness.
---
 drivers/net/wireless/atmel/at76c50x-usb.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/atmel/at76c50x-usb.c b/drivers/net/wireless/atmel/at76c50x-usb.c
index 7582761c61e2..3847c59b9672 100644
--- a/drivers/net/wireless/atmel/at76c50x-usb.c
+++ b/drivers/net/wireless/atmel/at76c50x-usb.c
@@ -523,10 +523,10 @@ static void at76_ledtrig_tx_timerfunc(struct timer_list *unused)
 
 	if (tx_lastactivity != tx_activity) {
 		tx_lastactivity = tx_activity;
-		led_trigger_event(ledtrig_tx, LED_FULL);
+		led_trigger_event(ledtrig_tx, 255);
 		mod_timer(&ledtrig_tx_timer, jiffies + HZ / 4);
 	} else
-		led_trigger_event(ledtrig_tx, LED_OFF);
+		led_trigger_event(ledtrig_tx, 0);
 }
 
 static void at76_ledtrig_tx_activity(void)
-- 
2.34.1

[PATCH 16/31] net: broadcom: changing LED_* from enum led_brightness to actual value

[Luiz Sampaio]

The enum led_brightness, which contains the declaration of LED_OFF,
LED_ON, LED_HALF and LED_FULL is obsolete, as the led class now supports
max_brightness.
---
 drivers/net/wireless/broadcom/b43/leds.c       | 2 +-
 drivers/net/wireless/broadcom/b43legacy/leds.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/broadcom/b43/leds.c b/drivers/net/wireless/broadcom/b43/leds.c
index 982a772a9d87..bdb46168e019 100644
--- a/drivers/net/wireless/broadcom/b43/leds.c
+++ b/drivers/net/wireless/broadcom/b43/leds.c
@@ -59,7 +59,7 @@ static void b43_led_update(struct b43_wldev *dev,
 	 * with the brightness_set handler, we will be called again soon
 	 * to fixup our state. */
 	if (radio_enabled)
-		turn_on = atomic_read(&led->state) != LED_OFF;
+		turn_on = atomic_read(&led->state) != 0;
 	else
 		turn_on = false;
 	if (turn_on == led->hw_state)
diff --git a/drivers/net/wireless/broadcom/b43legacy/leds.c b/drivers/net/wireless/broadcom/b43legacy/leds.c
index 38b5be3a84e2..5803d41185e7 100644
--- a/drivers/net/wireless/broadcom/b43legacy/leds.c
+++ b/drivers/net/wireless/broadcom/b43legacy/leds.c
@@ -66,7 +66,7 @@ static void b43legacy_led_brightness_set(struct led_classdev *led_dev,
 	 * whether the LED has the wrong state for a second. */
 	radio_enabled = (dev->phy.radio_on && dev->radio_hw_enable);
 
-	if (brightness == LED_OFF || !radio_enabled)
+	if (brightness == 0 || !radio_enabled)
 		b43legacy_led_turn_off(dev, led->index, led->activelow);
 	else
 		b43legacy_led_turn_on(dev, led->index, led->activelow);
-- 
2.34.1

[PATCH 17/31] net: intersil: changing LED_* from enum led_brightness to actual value

[Luiz Sampaio]

The enum led_brightness, which contains the declaration of LED_OFF,
LED_ON, LED_HALF and LED_FULL is obsolete, as the led class now supports
max_brightness.
---
 drivers/net/wireless/intersil/p54/led.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/intersil/p54/led.c b/drivers/net/wireless/intersil/p54/led.c
index 4bc77010f9c1..c5966b32416e 100644
--- a/drivers/net/wireless/intersil/p54/led.c
+++ b/drivers/net/wireless/intersil/p54/led.c
@@ -43,7 +43,7 @@ static void p54_update_leds(struct work_struct *work)
 			if (tmp < blink_delay)
 				blink_delay = tmp;
 
-			if (priv->leds[i].led_dev.brightness == LED_OFF)
+			if (priv->leds[i].led_dev.brightness == 0)
 				rerun = true;
 
 			priv->leds[i].toggled =
-- 
2.34.1

[PATCH 18/31] net: wireless: ralink: changing LED_* from enum led_brightness to actual value

[Luiz Sampaio]

The enum led_brightness, which contains the declaration of LED_OFF,
LED_ON, LED_HALF and LED_FULL is obsolete, as the led class now supports
max_brightness.
---
 drivers/net/wireless/ralink/rt2x00/rt2400pci.c  |  2 +-
 drivers/net/wireless/ralink/rt2x00/rt2500pci.c  |  2 +-
 drivers/net/wireless/ralink/rt2x00/rt2500usb.c  |  2 +-
 drivers/net/wireless/ralink/rt2x00/rt2800lib.c  |  4 ++--
 drivers/net/wireless/ralink/rt2x00/rt2x00leds.c | 16 ++++++++--------
 drivers/net/wireless/ralink/rt2x00/rt61pci.c    |  4 ++--
 drivers/net/wireless/ralink/rt2x00/rt73usb.c    |  4 ++--
 7 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/drivers/net/wireless/ralink/rt2x00/rt2400pci.c b/drivers/net/wireless/ralink/rt2x00/rt2400pci.c
index dec6ffdf07c4..d8b7f1a73267 100644
--- a/drivers/net/wireless/ralink/rt2x00/rt2400pci.c
+++ b/drivers/net/wireless/ralink/rt2x00/rt2400pci.c
@@ -204,7 +204,7 @@ static void rt2400pci_brightness_set(struct led_classdev *led_cdev,
 {
 	struct rt2x00_led *led =
 	    container_of(led_cdev, struct rt2x00_led, led_dev);
-	unsigned int enabled = brightness != LED_OFF;
+	unsigned int enabled = brightness != 0;
 	u32 reg;
 
 	reg = rt2x00mmio_register_read(led->rt2x00dev, LEDCSR);
diff --git a/drivers/net/wireless/ralink/rt2x00/rt2500pci.c b/drivers/net/wireless/ralink/rt2x00/rt2500pci.c
index 8faa0a80e73a..fe490a6382fe 100644
--- a/drivers/net/wireless/ralink/rt2x00/rt2500pci.c
+++ b/drivers/net/wireless/ralink/rt2x00/rt2500pci.c
@@ -204,7 +204,7 @@ static void rt2500pci_brightness_set(struct led_classdev *led_cdev,
 {
 	struct rt2x00_led *led =
 	    container_of(led_cdev, struct rt2x00_led, led_dev);
-	unsigned int enabled = brightness != LED_OFF;
+	unsigned int enabled = brightness != 0;
 	u32 reg;
 
 	reg = rt2x00mmio_register_read(led->rt2x00dev, LEDCSR);
diff --git a/drivers/net/wireless/ralink/rt2x00/rt2500usb.c b/drivers/net/wireless/ralink/rt2x00/rt2500usb.c
index bb5ed6630645..b25c32a03d99 100644
--- a/drivers/net/wireless/ralink/rt2x00/rt2500usb.c
+++ b/drivers/net/wireless/ralink/rt2x00/rt2500usb.c
@@ -267,7 +267,7 @@ static void rt2500usb_brightness_set(struct led_classdev *led_cdev,
 {
 	struct rt2x00_led *led =
 	    container_of(led_cdev, struct rt2x00_led, led_dev);
-	unsigned int enabled = brightness != LED_OFF;
+	unsigned int enabled = brightness != 0;
 	u16 reg;
 
 	reg = rt2500usb_register_read(led->rt2x00dev, MAC_CSR20);
diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
index deddb0afd312..8441e6e5320a 100644
--- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
@@ -1521,7 +1521,7 @@ static void rt2800_brightness_set(struct led_classdev *led_cdev,
 {
 	struct rt2x00_led *led =
 	    container_of(led_cdev, struct rt2x00_led, led_dev);
-	unsigned int enabled = brightness != LED_OFF;
+	unsigned int enabled = brightness != 0;
 	unsigned int bg_mode =
 	    (enabled && led->rt2x00dev->curr_band == NL80211_BAND_2GHZ);
 	unsigned int polarity =
@@ -1570,7 +1570,7 @@ static void rt2800_brightness_set(struct led_classdev *led_cdev,
 			 *	(1 << level) - 1
 			 */
 			rt2800_mcu_request(led->rt2x00dev, MCU_LED_STRENGTH, 0xff,
-					      (1 << brightness / (LED_FULL / 6)) - 1,
+					      (1 << brightness / (255 / 6)) - 1,
 					      polarity);
 		}
 	}
diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00leds.c b/drivers/net/wireless/ralink/rt2x00/rt2x00leds.c
index f5361d582d4e..3ef2a81aed7d 100644
--- a/drivers/net/wireless/ralink/rt2x00/rt2x00leds.c
+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00leds.c
@@ -52,7 +52,7 @@ void rt2x00leds_led_quality(struct rt2x00_dev *rt2x00dev, int rssi)
 	 * is going to calculate the value and might use it in a
 	 * division.
 	 */
-	brightness = ((LED_FULL / 6) * rssi) + 1;
+	brightness = ((255 / 6) * rssi) + 1;
 	if (brightness != led->led_dev.brightness) {
 		led->led_dev.brightness_set(&led->led_dev, brightness);
 		led->led_dev.brightness = brightness;
@@ -61,7 +61,7 @@ void rt2x00leds_led_quality(struct rt2x00_dev *rt2x00dev, int rssi)
 
 static void rt2x00led_led_simple(struct rt2x00_led *led, bool enabled)
 {
-	unsigned int brightness = enabled ? LED_FULL : LED_OFF;
+	unsigned int brightness = enabled ? 255 : 0;
 
 	if (!(led->flags & LED_REGISTERED))
 		return;
@@ -96,7 +96,7 @@ static int rt2x00leds_register_led(struct rt2x00_dev *rt2x00dev,
 	int retval;
 
 	led->led_dev.name = name;
-	led->led_dev.brightness = LED_OFF;
+	led->led_dev.brightness = 0;
 
 	retval = led_classdev_register(device, &led->led_dev);
 	if (retval) {
@@ -179,7 +179,7 @@ static void rt2x00leds_unregister_led(struct rt2x00_led *led)
 	 * possible yet.
 	 */
 	if (!(led->led_dev.flags & LED_SUSPENDED))
-		led->led_dev.brightness_set(&led->led_dev, LED_OFF);
+		led->led_dev.brightness_set(&led->led_dev, 0);
 
 	led->flags &= ~LED_REGISTERED;
 }
@@ -199,8 +199,8 @@ static inline void rt2x00leds_suspend_led(struct rt2x00_led *led)
 	led_classdev_suspend(&led->led_dev);
 
 	/* This shouldn't be needed, but just to be safe */
-	led->led_dev.brightness_set(&led->led_dev, LED_OFF);
-	led->led_dev.brightness = LED_OFF;
+	led->led_dev.brightness_set(&led->led_dev, 0);
+	led->led_dev.brightness = 0;
 }
 
 void rt2x00leds_suspend(struct rt2x00_dev *rt2x00dev)
@@ -218,8 +218,8 @@ static inline void rt2x00leds_resume_led(struct rt2x00_led *led)
 	led_classdev_resume(&led->led_dev);
 
 	/* Device might have enabled the LEDS during resume */
-	led->led_dev.brightness_set(&led->led_dev, LED_OFF);
-	led->led_dev.brightness = LED_OFF;
+	led->led_dev.brightness_set(&led->led_dev, 0);
+	led->led_dev.brightness = 0;
 }
 
 void rt2x00leds_resume(struct rt2x00_dev *rt2x00dev)
diff --git a/drivers/net/wireless/ralink/rt2x00/rt61pci.c b/drivers/net/wireless/ralink/rt2x00/rt61pci.c
index 82cfc2aadc2b..d48a7d06013c 100644
--- a/drivers/net/wireless/ralink/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/ralink/rt2x00/rt61pci.c
@@ -242,7 +242,7 @@ static void rt61pci_brightness_set(struct led_classdev *led_cdev,
 {
 	struct rt2x00_led *led =
 	    container_of(led_cdev, struct rt2x00_led, led_dev);
-	unsigned int enabled = brightness != LED_OFF;
+	unsigned int enabled = brightness != 0;
 	unsigned int a_mode =
 	    (enabled && led->rt2x00dev->curr_band == NL80211_BAND_5GHZ);
 	unsigned int bg_mode =
@@ -271,7 +271,7 @@ static void rt61pci_brightness_set(struct led_classdev *led_cdev,
 		 * argument into the matching level within that range.
 		 */
 		rt61pci_mcu_request(led->rt2x00dev, MCU_LED_STRENGTH, 0xff,
-				    brightness / (LED_FULL / 6), 0);
+				    brightness / (255 / 6), 0);
 	}
 }
 
diff --git a/drivers/net/wireless/ralink/rt2x00/rt73usb.c b/drivers/net/wireless/ralink/rt2x00/rt73usb.c
index 5ff2c740c3ea..45b98395cf9e 100644
--- a/drivers/net/wireless/ralink/rt2x00/rt73usb.c
+++ b/drivers/net/wireless/ralink/rt2x00/rt73usb.c
@@ -187,7 +187,7 @@ static void rt73usb_brightness_set(struct led_classdev *led_cdev,
 {
 	struct rt2x00_led *led =
 	   container_of(led_cdev, struct rt2x00_led, led_dev);
-	unsigned int enabled = brightness != LED_OFF;
+	unsigned int enabled = brightness != 0;
 	unsigned int a_mode =
 	    (enabled && led->rt2x00dev->curr_band == NL80211_BAND_5GHZ);
 	unsigned int bg_mode =
@@ -216,7 +216,7 @@ static void rt73usb_brightness_set(struct led_classdev *led_cdev,
 		 * argument into the matching level within that range.
 		 */
 		rt2x00usb_vendor_request_sw(led->rt2x00dev, USB_LED_CONTROL,
-					    brightness / (LED_FULL / 6),
+					    brightness / (255 / 6),
 					    led->rt2x00dev->led_mcu_reg,
 					    REGISTER_TIMEOUT);
 	}
-- 
2.34.1

[PATCH 19/31] net: realtek: changing LED_* from enum led_brightness to actual value

[Luiz Sampaio]

The enum led_brightness, which contains the declaration of LED_OFF,
LED_ON, LED_HALF and LED_FULL is obsolete, as the led class now supports
max_brightness.
---
 drivers/net/wireless/realtek/rtl818x/rtl8187/leds.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/realtek/rtl818x/rtl8187/leds.c b/drivers/net/wireless/realtek/rtl818x/rtl8187/leds.c
index 49421d10e22b..6ddbdb5e3fa5 100644
--- a/drivers/net/wireless/realtek/rtl818x/rtl8187/leds.c
+++ b/drivers/net/wireless/realtek/rtl818x/rtl8187/leds.c
@@ -109,7 +109,7 @@ static void rtl8187_led_brightness_set(struct led_classdev *led_dev,
 		return;
 	priv = hw->priv;
 	if (led->is_radio) {
-		if (brightness == LED_FULL) {
+		if (brightness == 255) {
 			ieee80211_queue_delayed_work(hw, &priv->led_on, 0);
 			radio_on = true;
 		} else if (radio_on) {
@@ -118,7 +118,7 @@ static void rtl8187_led_brightness_set(struct led_classdev *led_dev,
 			ieee80211_queue_delayed_work(hw, &priv->led_off, 0);
 		}
 	} else if (radio_on) {
-		if (brightness == LED_OFF) {
+		if (brightness == 0) {
 			ieee80211_queue_delayed_work(hw, &priv->led_off, 0);
 			/* The LED is off for 1/20 sec - it just blinks. */
 			ieee80211_queue_delayed_work(hw, &priv->led_on,
-- 
2.34.1

[PATCH 26/31] net: bluetooth: changing LED_* from enum led_brightness to actual value

[Luiz Sampaio]

The enum led_brightness, which contains the declaration of LED_OFF,
LED_ON, LED_HALF and LED_FULL is obsolete, as the led class now supports
max_brightness.
---
 net/bluetooth/leds.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net/bluetooth/leds.c b/net/bluetooth/leds.c
index f46847632ffa..7f7e3eed9407 100644
--- a/net/bluetooth/leds.c
+++ b/net/bluetooth/leds.c
@@ -22,7 +22,7 @@ void hci_leds_update_powered(struct hci_dev *hdev, bool enabled)
 {
 	if (hdev->power_led)
 		led_trigger_event(hdev->power_led,
-				  enabled ? LED_FULL : LED_OFF);
+				  enabled ? 255 : 0);
 
 	if (!enabled) {
 		struct hci_dev *d;
@@ -37,7 +37,7 @@ void hci_leds_update_powered(struct hci_dev *hdev, bool enabled)
 		read_unlock(&hci_dev_list_lock);
 	}
 
-	led_trigger_event(bt_power_led_trigger, enabled ? LED_FULL : LED_OFF);
+	led_trigger_event(bt_power_led_trigger, enabled ? 255 : 0);
 }
 
 static int power_activate(struct led_classdev *led_cdev)
@@ -48,7 +48,7 @@ static int power_activate(struct led_classdev *led_cdev)
 	htrig = to_hci_basic_led_trigger(led_cdev->trigger);
 	powered = test_bit(HCI_UP, &htrig->hdev->flags);
 
-	led_trigger_event(led_cdev->trigger, powered ? LED_FULL : LED_OFF);
+	led_trigger_event(led_cdev->trigger, powered ? 255 : 0);
 
 	return 0;
 }
-- 
2.34.1

[PATCH 27/31] net: mac80211 : changing LED_* from enum led_brightness to actual value

[Luiz Sampaio]

The enum led_brightness, which contains the declaration of LED_OFF,
LED_ON, LED_HALF and LED_FULL is obsolete, as the led class now supports
max_brightness.
---
 net/mac80211/led.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/net/mac80211/led.c b/net/mac80211/led.c
index 6de8d0ad5497..ac36579636bb 100644
--- a/net/mac80211/led.c
+++ b/net/mac80211/led.c
@@ -14,9 +14,9 @@ void ieee80211_led_assoc(struct ieee80211_local *local, bool associated)
 	if (!atomic_read(&local->assoc_led_active))
 		return;
 	if (associated)
-		led_trigger_event(&local->assoc_led, LED_FULL);
+		led_trigger_event(&local->assoc_led, 255);
 	else
-		led_trigger_event(&local->assoc_led, LED_OFF);
+		led_trigger_event(&local->assoc_led, 0);
 }
 
 void ieee80211_led_radio(struct ieee80211_local *local, bool enabled)
@@ -24,9 +24,9 @@ void ieee80211_led_radio(struct ieee80211_local *local, bool enabled)
 	if (!atomic_read(&local->radio_led_active))
 		return;
 	if (enabled)
-		led_trigger_event(&local->radio_led, LED_FULL);
+		led_trigger_event(&local->radio_led, 255);
 	else
-		led_trigger_event(&local->radio_led, LED_OFF);
+		led_trigger_event(&local->radio_led, 0);
 }
 
 void ieee80211_alloc_led_names(struct ieee80211_local *local)
@@ -344,7 +344,7 @@ static void ieee80211_stop_tpt_led_trig(struct ieee80211_local *local)
 	tpt_trig->running = false;
 	del_timer_sync(&tpt_trig->timer);
 
-	led_trigger_event(&local->tpt_led, LED_OFF);
+	led_trigger_event(&local->tpt_led, 0);
 }
 
 void ieee80211_mod_tpt_led_trig(struct ieee80211_local *local,
-- 
2.34.1

[PATCH 28/31] net: netfilter: changing LED_* from enum led_brightness to actual value

[Luiz Sampaio]

The enum led_brightness, which contains the declaration of LED_OFF,
LED_ON, LED_HALF and LED_FULL is obsolete, as the led class now supports
max_brightness.
---
 net/netfilter/xt_LED.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net/netfilter/xt_LED.c b/net/netfilter/xt_LED.c
index 0371c387b0d1..eb66e12c7ff7 100644
--- a/net/netfilter/xt_LED.c
+++ b/net/netfilter/xt_LED.c
@@ -54,7 +54,7 @@ led_tg(struct sk_buff *skb, const struct xt_action_param *par)
 		led_trigger_blink_oneshot(&ledinternal->netfilter_led_trigger,
 					  &led_delay, &led_delay, 1);
 	else
-		led_trigger_event(&ledinternal->netfilter_led_trigger, LED_FULL);
+		led_trigger_event(&ledinternal->netfilter_led_trigger, 255);
 
 	/* If there's a positive delay, start/update the timer */
 	if (ledinfo->delay > 0) {
@@ -63,7 +63,7 @@ led_tg(struct sk_buff *skb, const struct xt_action_param *par)
 
 	/* Otherwise if there was no delay given, blink as fast as possible */
 	} else if (ledinfo->delay == 0) {
-		led_trigger_event(&ledinternal->netfilter_led_trigger, LED_OFF);
+		led_trigger_event(&ledinternal->netfilter_led_trigger, 0);
 	}
 
 	/* else the delay is negative, which means switch on and stay on */
@@ -76,7 +76,7 @@ static void led_timeout_callback(struct timer_list *t)
 	struct xt_led_info_internal *ledinternal = from_timer(ledinternal, t,
 							      timer);
 
-	led_trigger_event(&ledinternal->netfilter_led_trigger, LED_OFF);
+	led_trigger_event(&ledinternal->netfilter_led_trigger, 0);
 }
 
 static struct xt_led_info_internal *led_trigger_lookup(const char *name)
-- 
2.34.1

[PATCH 29/31] net: rfkill: changing LED_* from enum led_brightness to actual value

[Luiz Sampaio]

The enum led_brightness, which contains the declaration of LED_OFF,
LED_ON, LED_HALF and LED_FULL is obsolete, as the led class now supports
max_brightness.
---
 net/rfkill/core.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/net/rfkill/core.c b/net/rfkill/core.c
index 5b1927d66f0d..68b4c3a71513 100644
--- a/net/rfkill/core.c
+++ b/net/rfkill/core.c
@@ -125,9 +125,9 @@ static void rfkill_led_trigger_event(struct rfkill *rfkill)
 	trigger = &rfkill->led_trigger;
 
 	if (rfkill->state & RFKILL_BLOCK_ANY)
-		led_trigger_event(trigger, LED_OFF);
+		led_trigger_event(trigger, 0);
 	else
-		led_trigger_event(trigger, LED_FULL);
+		led_trigger_event(trigger, 255);
 }
 
 static int rfkill_led_trigger_activate(struct led_classdev *led)
@@ -180,7 +180,7 @@ static void rfkill_global_led_trigger_worker(struct work_struct *work)
 	mutex_lock(&rfkill_global_mutex);
 	list_for_each_entry(rfkill, &rfkill_list, node) {
 		if (!(rfkill->state & RFKILL_BLOCK_ANY)) {
-			brightness = LED_FULL;
+			brightness = 255;
 			break;
 		}
 	}
@@ -188,7 +188,7 @@ static void rfkill_global_led_trigger_worker(struct work_struct *work)
 
 	led_trigger_event(&rfkill_any_led_trigger, brightness);
 	led_trigger_event(&rfkill_none_led_trigger,
-			  brightness == LED_OFF ? LED_FULL : LED_OFF);
+			  brightness == 0 ? 255 : 0);
 }
 
 static void rfkill_global_led_trigger_event(void)
-- 
2.34.1

Re: [PATCH 27/31] net: mac80211 : changing LED_* from enum led_brightness to actual value

[Johannes Berg]

On Fri, 2022-01-21 at 13:54 -0300, Luiz Sampaio wrote:
> The enum led_brightness, which contains the declaration of LED_OFF,
> LED_ON, LED_HALF and LED_FULL is obsolete, as the led class now supports
> max_brightness.
> 

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

and particularly

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches#commit_messages

would be a good thing to read.

Also, clearly you need to actually sign off your patches:
https://www.kernel.org/doc/html/latest/process/submitting-patches.html#developer-s-certificate-of-origin-1-1

(but yeah read the entire page)

Anyway, I'm with the other comments - what's the point in replacing
things like "LED_FULL" with arbitrary "255". I guess your commit message
should explain that, I don't see how it really is so obviously
"obsolete" that this needs no more comments.

johannes

Re: [PATCH 26/31] net: bluetooth: changing LED_* from enum led_brightness to actual value

[Marcel Holtmann]

Hi Luiz,

> The enum led_brightness, which contains the declaration of LED_OFF,
> LED_ON, LED_HALF and LED_FULL is obsolete, as the led class now supports
> max_brightness.
> ---
> net/bluetooth/leds.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/net/bluetooth/leds.c b/net/bluetooth/leds.c
> index f46847632ffa..7f7e3eed9407 100644
> --- a/net/bluetooth/leds.c
> +++ b/net/bluetooth/leds.c
> @@ -22,7 +22,7 @@ void hci_leds_update_powered(struct hci_dev *hdev, bool enabled)
> {
> 	if (hdev->power_led)
> 		led_trigger_event(hdev->power_led,
> -				  enabled ? LED_FULL : LED_OFF);
> +				  enabled ? 255 : 0);
> 
> 	if (!enabled) {
> 		struct hci_dev *d;
> @@ -37,7 +37,7 @@ void hci_leds_update_powered(struct hci_dev *hdev, bool enabled)
> 		read_unlock(&hci_dev_list_lock);
> 	}
> 
> -	led_trigger_event(bt_power_led_trigger, enabled ? LED_FULL : LED_OFF);
> +	led_trigger_event(bt_power_led_trigger, enabled ? 255 : 0);
> }
> 
> static int power_activate(struct led_classdev *led_cdev)
> @@ -48,7 +48,7 @@ static int power_activate(struct led_classdev *led_cdev)
> 	htrig = to_hci_basic_led_trigger(led_cdev->trigger);
> 	powered = test_bit(HCI_UP, &htrig->hdev->flags);
> 
> -	led_trigger_event(led_cdev->trigger, powered ? LED_FULL : LED_OFF);
> +	led_trigger_event(led_cdev->trigger, powered ? 255 : 0);

how is this leading to more readable code?

What is wrong with providing proper constants to use instead of funky numbers now. I
think that changing every user of LED_FULL etc. and replacing it with 255 is stupid.

Seriously, add a #define LED_FULL 255 and leave the users alone.

Regards

Marcel

Re: [PATCH 16/31] net: broadcom: changing LED_* from enum led_brightness to actual value

[Arend van Spriel]

[-- Attachment #1: Type: text/plain, Size: 867 bytes --]

On 1/21/2022 5:54 PM, Luiz Sampaio wrote:
> The enum led_brightness, which contains the declaration of LED_OFF,
> LED_ON, LED_HALF and LED_FULL is obsolete, as the led class now supports
> max_brightness.

The commit message sounds a bit obscure to me. You say the 
led_brightness enumeration is or rather will become obsolete. I don't 
understand the reason given "led class now supports max_brightness". 
What does that mean?

Also I do not understand the approach here. If the enum is obsolete why 
not start with the APIs using it like the led callbacks 
brightness_{get,set{,_blocking}}. I suspect that is your next step, but 
it seems like unnecessary churn to me.

Anyway, what triggered me to look at this is the fact that we do have a 
led.c under drivers/net/wireless/broadcom/brcm80211/brcmsmac 
implementing the brightness_set() callback.

Regards,
Arend

[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4219 bytes --]