Re: [PATCH 2/3] ledtrig-ide-disk: use generic one-shot blink api

[Bryan Wu]

On Sun, May 27, 2012 at 7:19 AM, Fabio Baltieri
<fabio.baltieri@xxxxxxxxx> wrote:
> Convert ledtrig-ide-disk code to use the generic API for one-shot LED
> blinking.
>
> This patch changes slightly the behaviour of the trigger, as while the
> original version kept the LED on under heavy activity, the new one keeps
> a constant on-off blink at 1 / (2 * BLINK_DELAY) Hz.
>

Applied to my for-next branch after removing 2 useless header files,
since with this patch we don't need them.

-Bryan

> Signed-off-by: Fabio Baltieri <fabio.baltieri@xxxxxxxxx>
> Cc: Bryan Wu <bryan.wu@xxxxxxxxxxxxx>
> ---
>  drivers/leds/ledtrig-ide-disk.c | 23 ++++-------------------
>  1 file changed, 4 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/leds/ledtrig-ide-disk.c b/drivers/leds/ledtrig-ide-disk.c
> index ec099fc..0ff16fb 100644
> --- a/drivers/leds/ledtrig-ide-disk.c
> +++ b/drivers/leds/ledtrig-ide-disk.c
> @@ -18,33 +18,18 @@
>  #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);
> --
> 1.7.10.2.520.g6a4a482.dirty
>



-- 
Bryan Wu <bryan.wu@xxxxxxxxxxxxx>
Kernel Developer    +86.186-168-78255 Mobile
Canonical Ltd.      www.canonical.com
Ubuntu - Linux for human beings | www.ubuntu.com
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/