Trivial: Fix coding style in worker thread code for ledtrig-gpio.
PATCH 1/3 Trivial: Fix coding style in worker thread code for ledtrig-gpio.
--- drivers/leds/ledtrig-gpio.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-)
drivers/leds/ledtrig-gpio.c +14 -14
@@ -44,22 +44,22 @@ static void gpio_trig_work(struct work_struct *work) struct gpio_trig_data, work);int tmp; -if (!gpio_data->gpio) +if (!gpio_data->gpio)return ; - tmp =gpio_get_value (gpio_data->gpio); -if (gpio_data->inverted) - tmp = !tmp; - -if (tmp) { -if (gpio_data->desired_brightness) -led_set_brightness (gpio_data->led, - gpio_data->desired_brightness); -else -led_set_brightness (gpio_data->led,LED_FULL ); - }else { -led_set_brightness (gpio_data->led,LED_OFF ); - } + tmp =gpio_get_value (gpio_data->gpio); +if (gpio_data->inverted) + tmp = !tmp; + +if (tmp) { +if (gpio_data->desired_brightness) +led_set_brightness (gpio_data->led, + gpio_data->desired_brightness); +else +led_set_brightness (gpio_data->led,LED_FULL ); + }else { +led_set_brightness (gpio_data->led,LED_OFF ); + } } static ssize_t gpio_trig_brightness_show(struct device *dev,
Signature · 1 line
1.6.3.3
PATCH 2/3 Fix multiple requests and releases of IRQ for GPIO LED Trigger.
When setting the same GPIO number, multiple IRQ shared requests will be done without freing the previous request. It will also try to free a failed request or an already freed IRQ if 0 was written to the gpio file.
All these oops and leaks were fixed with the following solution: keep the previous allocated GPIO (if any) still allocated in case the new request fails. The alternative solution would desallocate the previous allocated GPIO and set gpio as 0.
--- drivers/leds/ledtrig-gpio.c | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-)
drivers/leds/ledtrig-gpio.c +14 -7
@@ -146,20 +146,26 @@ static ssize_t gpio_trig_gpio_store(struct device *dev,return -EINVAL ; } +if (gpio_data->gpio == gpio) +return n; +if (!gpio) { -free_irq (gpio_to_irq (gpio_data->gpio), led); +if (gpio_data->gpio !=0 ) +free_irq (gpio_to_irq (gpio_data->gpio), led); + gpio_data->gpio =0 ;return n; } -if (gpio_data->gpio >0 && gpio_data->gpio != gpio) -free_irq (gpio_to_irq (gpio_data->gpio), led); - - gpio_data->gpio = gpio; ret =request_irq (gpio_to_irq (gpio), gpio_trig_irq,IRQF_SHARED |IRQF_TRIGGER_RISING |IRQF_TRIGGER_FALLING ,"ledtrig-gpio" , led); -if (ret) +if (ret) {dev_err (dev,"request_irq failed with error %d\n" , ret); + }else { +if (gpio_data->gpio !=0 ) +free_irq (gpio_to_irq (gpio_data->gpio), led); + gpio_data->gpio = gpio; + }return ret ? ret : n; }
@@ -211,7 +217,8 @@ static void gpio_trig_deactivate(struct led_classdev *led)device_remove_file (led->dev, &dev_attr_inverted);device_remove_file (led->dev, &dev_attr_desired_brightness);flush_work (&gpio_data->work); -free_irq (gpio_to_irq (gpio_data->gpio),led); +if (gpio_data->gpio !=0 ) +free_irq (gpio_to_irq (gpio_data->gpio), led);kfree (gpio_data); } }
Signature · 1 line
1.6.3.3
PATCH 3/3 After setting inverted attribute, we must update the LED.
If we change the inverted attribute to another value, the LED will not be inverted until we change the GPIO state.
--- drivers/leds/ledtrig-gpio.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
drivers/leds/ledtrig-gpio.c +3 -0
@@ -117,6 +117,9 @@ static ssize_t gpio_trig_inverted_store(struct device *dev, gpio_data->inverted = !!inverted; +/* After inverting, we need to update the LED. */ +schedule_work (&gpio_data->work); +return n; } static DEVICE_ATTR(inverted, 0644, gpio_trig_inverted_show,
Signature · 1 line
1.6.3.3
PATCH 1/1 Trivial: Fix coding style in worker thread code for ledtrig-gpio.
In reply to Thadeu Lima de Souza Cascardo--- drivers/leds/ledtrig-gpio.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-)
drivers/leds/ledtrig-gpio.c +16 -16
@@ -44,22 +44,22 @@ static void gpio_trig_work(struct work_struct *work) struct gpio_trig_data, work);int tmp; -if (!gpio_data->gpio) -return ; - - tmp =gpio_get_value (gpio_data->gpio); -if (gpio_data->inverted) - tmp = !tmp; - -if (tmp) { -if (gpio_data->desired_brightness) -led_set_brightness (gpio_data->led, - gpio_data->desired_brightness); -else -led_set_brightness (gpio_data->led,LED_FULL ); - }else { -led_set_brightness (gpio_data->led,LED_OFF ); - } +if (!gpio_data->gpio) +return ; + + tmp =gpio_get_value (gpio_data->gpio); +if (gpio_data->inverted) + tmp = !tmp; + +if (tmp) { +if (gpio_data->desired_brightness) +led_set_brightness (gpio_data->led, + gpio_data->desired_brightness); +else +led_set_brightness (gpio_data->led,LED_FULL ); + }else { +led_set_brightness (gpio_data->led,LED_OFF ); + } } static ssize_t gpio_trig_brightness_show(struct device *dev,
Signature · 1 line
1.6.3.3