Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / drivers / leds / ledtrig-ide-disk.c

diff --git a/drivers/leds/ledtrig-ide-disk.c b/drivers/leds/ledtrig-ide-disk.c
index ec099fcbcb00ecf01c4f8ef4313710230428b15b..2cd7c0cf5924fe17807446d12287058566fadd36 100644 (file)
--- a/drivers/leds/ledtrig-ide-disk.c
+++ b/drivers/leds/ledtrig-ide-disk.c
@@ -12,39 +12,22 @@
  */
 
 #include <linux/module.h>
-#include <linux/jiffies.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <linux/timer.h>
 #include <linux/leds.h>
 
-static void ledtrig_ide_timerfunc(unsigned long data);
+#define BLINK_DELAY 30
 
 DEFINE_LED_TRIGGER(ledtrig_ide);
-static DEFINE_TIMER(ledtrig_ide_timer, ledtrig_ide_timerfunc, 0, 0);
-static int ide_activity;
-static int ide_lastactivity;
+static unsigned long ide_blink_delay = BLINK_DELAY;
 
 void ledtrig_ide_activity(void)
 {
-       ide_activity++;
-       if (!timer_pending(&ledtrig_ide_timer))
-               mod_timer(&ledtrig_ide_timer, jiffies + msecs_to_jiffies(10));
+       led_trigger_blink_oneshot(ledtrig_ide,
+                                 &ide_blink_delay, &ide_blink_delay, 0);
 }
 EXPORT_SYMBOL(ledtrig_ide_activity);
 
-static void ledtrig_ide_timerfunc(unsigned long data)
-{
-       if (ide_lastactivity != ide_activity) {
-               ide_lastactivity = ide_activity;
-               /* INT_MAX will set each LED to its maximum brightness */
-               led_trigger_event(ledtrig_ide, INT_MAX);
-               mod_timer(&ledtrig_ide_timer, jiffies + msecs_to_jiffies(10));
-       } else {
-               led_trigger_event(ledtrig_ide, LED_OFF);
-       }
-}
-
 static int __init ledtrig_ide_init(void)
 {
        led_trigger_register_simple("ide-disk", &ledtrig_ide);