wifi: ath10k: drop gpio_led reference
PATCH 1/1 wifi: ath10k: drop gpio_led reference
From: Arnd Bergmann <[email protected]>
The driver uses a 'struct gpio_led' internally, but does not actually interact with the gpio_led driver, in particular it does not actually use gpiolib here.
Signed-off-by Arnd Bergmann <[email protected]>
--- drivers/net/wireless/ath/ath10k/core.h | 1 - drivers/net/wireless/ath/ath10k/leds.c | 8 +------- 2 files changed, 1 insertion(+), 8 deletions(-)
drivers/net/wireless/ath/ath10k/core.h +0 -1
@@ -1269,7 +1269,6 @@ struct ath10k { } testmode;struct { -struct gpio_led wifi_led;struct led_classdev cdev;char label[48 ];u32 gpio_state_pin;
drivers/net/wireless/ath/ath10k/leds.c +1 -7
@@ -19,15 +19,13 @@ static int ath10k_leds_set_brightness_blocking(struct led_classdev *led_cdev, { struct ath10k *ar = container_of(led_cdev, struct ath10k, leds.cdev); -struct gpio_led *led = &ar->leds.wifi_led;mutex_lock (&ar->conf_mutex);if (ar->state !=ATH10K_STATE_ON ) goto out; - ar->leds.gpio_state_pin = (brightness !=LED_OFF ) ^ led->active_low; -ath10k_wmi_gpio_output (ar, ar->hw_params.led_pin, ar->leds.gpio_state_pin); +ath10k_wmi_gpio_output (ar, ar->hw_params.led_pin, brightness ==LED_OFF ); out:mutex_unlock (&ar->conf_mutex);
@@ -63,13 +61,9 @@ int ath10k_leds_register(struct ath10k *ar)snprintf (ar->leds.label,sizeof (ar->leds.label),"ath10k-%s" ,wiphy_name (ar->hw->wiphy)); - ar->leds.wifi_led.active_low =1 ; - ar->leds.wifi_led.name = ar->leds.label; - ar->leds.wifi_led.default_state =LEDS_GPIO_DEFSTATE_KEEP ; ar->leds.cdev.name = ar->leds.label; ar->leds.cdev.brightness_set_blocking = ath10k_leds_set_brightness_blocking; - ar->leds.cdev.default_trigger = ar->leds.wifi_led.default_trigger; ret =led_classdev_register (wiphy_dev (ar->hw->wiphy), &ar->leds.cdev);if (ret)
Signature · 1 line
2.39.5
Quoted 7 lines · Arnd Bergmann
From: Arnd Bergmann <[email protected]>
The driver uses a 'struct
gpio_led' internally, but does not actually interact with thegpio_leddriver, in particular it does not actually use gpiolib here.Signed-off-by Arnd Bergmann <[email protected]>
Reviewed-by Loic Poulain <[email protected]>
Quoted 55 lines
--- drivers/net/wireless/ath/ath10k/core.h | 1 - drivers/net/wireless/ath/ath10k/leds.c | 8 +------- 2 files changed, 1 insertion(+), 8 deletions(-)drivers/net/wireless/ath/ath10k/core.h +0
-1@@ -1269,7 +1269,6 @@ struct ath10k { } testmode;struct { -struct gpio_led wifi_led;struct led_classdev cdev;char label[48 ];u32 gpio_state_pin;drivers/net/wireless/ath/ath10k/leds.c +1
-8@@ -19,15 +19,13 @@ static int ath10k_leds_set_brightness_blocking(struct led_classdev *led_cdev, { struct ath10k *ar = container_of(led_cdev, struct ath10k, leds.cdev); -struct gpio_led *led = &ar->leds.wifi_led;mutex_lock (&ar->conf_mutex);if (ar->state !=ATH10K_STATE_ON ) goto out; - ar->leds.gpio_state_pin = (brightness !=LED_OFF ) ^ led->active_low; -ath10k_wmi_gpio_output (ar, ar->hw_params.led_pin, ar->leds.gpio_state_pin); +ath10k_wmi_gpio_output (ar, ar->hw_params.led_pin, brightness ==LED_OFF ); out:mutex_unlock (&ar->conf_mutex);@@ -63,13 +61,9 @@ int ath10k_leds_register(struct ath10k *ar)snprintf (ar->leds.label,sizeof (ar->leds.label),"ath10k-%s" ,wiphy_name (ar->hw->wiphy)); - ar->leds.wifi_led.active_low =1 ; - ar->leds.wifi_led.name = ar->leds.label; - ar->leds.wifi_led.default_state =LEDS_GPIO_DEFSTATE_KEEP ; ar->leds.cdev.name = ar->leds.label; ar->leds.cdev.brightness_set_blocking = ath10k_leds_set_brightness_blocking; - ar->leds.cdev.default_trigger = ar->leds.wifi_led.default_trigger; ret =led_classdev_register (wiphy_dev (ar->hw->wiphy), &ar->leds.cdev);if (ret) --2.39.5
Jeff Johnson
AppliedQuoted 4 lines · Arnd Bergmann
The driver uses a 'struct
gpio_led' internally, but does not actually interact with thegpio_leddriver, in particular it does not actually use gpiolib here.
Applied, thanks!
[1/1] wifi: ath10k: drop gpio_led reference
commit: f8b7c2f1a45bb70eac754b2bd438168bbeafb499
Best regards,
Signature · 1 line
Jeff Johnson <[email protected]>