Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds

* 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds:
  leds: Add HP Jornada 6xx driver
  leds: Remove the now uneeded ixp4xx driver
  leds: Add power LED to the wrap driver
  leds: Fix led-gpio active_low default brightness
  leds: hw acceleration for Clevo mail LED driver
  leds: Add support for hardware accelerated LED flashing
  leds: Standardise LED naming scheme
  leds: Add clevo notebook LED driver

1 files changed, 37 insertions, 4 deletions

diff --git a/drivers/leds/ledtrig-timer.c b/drivers/leds/ledtrig-timer.c
index ed9ff02c77ea..82c55d6e4902 100644
--- a/drivers/leds/ledtrig-timer.c
+++ b/drivers/leds/ledtrig-timer.c
@@ -77,8 +77,21 @@ static ssize_t led_delay_on_store(struct device *dev,
                 count++;
 
         if (count == size) {
-                timer_data->delay_on = state;
-                mod_timer(&timer_data->timer, jiffies + 1);
+                if (timer_data->delay_on != state) {
+                        /* the new value differs from the previous */
+                        timer_data->delay_on = state;
+
+                        /* deactivate previous settings */
+                        del_timer_sync(&timer_data->timer);
+
+                        /* try to activate hardware acceleration, if any */
+                        if (!led_cdev->blink_set ||
+                            led_cdev->blink_set(led_cdev,
+                                &timer_data->delay_on, &timer_data->delay_off)) {
+                                /* no hardware acceleration, blink via timer */
+                                mod_timer(&timer_data->timer, jiffies + 1);
+                        }
+                }
                 ret = count;
         }
 
@@ -110,8 +123,21 @@ static ssize_t led_delay_off_store(struct device *dev,
                 count++;
 
         if (count == size) {
-                timer_data->delay_off = state;
-                mod_timer(&timer_data->timer, jiffies + 1);
+                if (timer_data->delay_off != state) {
+                        /* the new value differs from the previous */
+                        timer_data->delay_off = state;
+
+                        /* deactivate previous settings */
+                        del_timer_sync(&timer_data->timer);
+
+                        /* try to activate hardware acceleration, if any */
+                        if (!led_cdev->blink_set ||
+                            led_cdev->blink_set(led_cdev,
+                                &timer_data->delay_on, &timer_data->delay_off)) {
+                                /* no hardware acceleration, blink via timer */
+                                mod_timer(&timer_data->timer, jiffies + 1);
+                        }
+                }
                 ret = count;
         }
 
@@ -143,6 +169,13 @@ static void timer_trig_activate(struct led_classdev *led_cdev)
         if (rc)
                 goto err_out_delayon;
 
+        /* If there is hardware support for blinking, start one
+         * user friendly blink rate chosen by the driver.
+         */
+        if (led_cdev->blink_set)
+                led_cdev->blink_set(led_cdev,
+                        &timer_data->delay_on, &timer_data->delay_off);
+
         return;
 
 err_out_delayon: