[PATCH] LED: Add IDE disk activity LED trigger

Add an LED trigger for IDE disk activity to the ide-disk driver.

Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
Acked-by: Bartlomiej Zolnierkiewicz <B.Zolnierkiewicz@elka.pw.edu.pl>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index ccf528d733bfb59db29d98eac63244d5dbbea5e1..a5017de72da5c587fc41a0aec67b58c4b00f479e 100644 (file)
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -61,6 +61,7 @@
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/mutex.h>
+#include <linux/leds.h>
 
 #define _IDE_DISK
 
@@ -317,6 +318,8 @@ static ide_startstop_t ide_do_rw_disk (ide_drive_t *drive, struct request *rq, s
                return ide_stopped;
        }
 
+       ledtrig_ide_activity();
+
        pr_debug("%s: %sing: block=%llu, sectors=%lu, buffer=0x%08lx\n",
                 drive->name, rq_data_dir(rq) == READ ? "read" : "writ",
                 (unsigned long long)block, rq->nr_sectors,

diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index 64dcdd3185c0b24549a4f5d5e29be09983bd75a3..2c4f20b7f021591dea1495a057c0f988cce7093b 100644 (file)
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -66,5 +66,12 @@ config LEDS_TRIGGER_TIMER
          This allows LEDs to be controlled by a programmable timer
          via sysfs. If unsure, say Y.
 
+config LEDS_TRIGGER_IDE_DISK
+       bool "LED Timer Trigger"
+       depends LEDS_TRIGGERS && BLK_DEV_IDEDISK
+       help
+         This allows LEDs to be controlled by IDE disk activity.
+         If unsure, say Y.
+
 endmenu
 

diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile
index 9d2930f89d03c7c2d4235c03839c223675dbb865..40699d3cabbf377898aa9e566d794068ee7dc775 100644 (file)
--- a/drivers/leds/Makefile
+++ b/drivers/leds/Makefile
@@ -13,3 +13,4 @@ obj-$(CONFIG_LEDS_TOSA)                       += leds-tosa.o
 
 # LED Triggers
 obj-$(CONFIG_LEDS_TRIGGER_TIMER)       += ledtrig-timer.o
+obj-$(CONFIG_LEDS_TRIGGER_IDE_DISK)    += ledtrig-ide-disk.o

diff --git a/drivers/leds/ledtrig-ide-disk.c b/drivers/leds/ledtrig-ide-disk.c
new file mode 100644 (file)
index 0000000..fa65188
--- /dev/null
+++ b/drivers/leds/ledtrig-ide-disk.c
@@ -0,0 +1,62 @@
+/*
+ * LED IDE-Disk Activity Trigger
+ *
+ * Copyright 2006 Openedhand Ltd.
+ *
+ * Author: Richard Purdie <rpurdie@openedhand.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ */
+
+#include <linux/module.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_LED_TRIGGER(ledtrig_ide);
+static DEFINE_TIMER(ledtrig_ide_timer, ledtrig_ide_timerfunc, 0, 0);
+static int ide_activity;
+static int ide_lastactivity;
+
+void ledtrig_ide_activity(void)
+{
+       ide_activity++;
+       if (!timer_pending(&ledtrig_ide_timer))
+               mod_timer(&ledtrig_ide_timer, jiffies + msecs_to_jiffies(10));
+}
+EXPORT_SYMBOL(ledtrig_ide_activity);
+
+static void ledtrig_ide_timerfunc(unsigned long data)
+{
+       if (ide_lastactivity != ide_activity) {
+               ide_lastactivity = ide_activity;
+               led_trigger_event(ledtrig_ide, LED_FULL);
+               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);
+       return 0;
+}
+
+static void __exit ledtrig_ide_exit(void)
+{
+       led_trigger_unregister_simple(ledtrig_ide);
+}
+
+module_init(ledtrig_ide_init);
+module_exit(ledtrig_ide_exit);
+
+MODULE_AUTHOR("Richard Purdie <rpurdie@openedhand.com>");
+MODULE_DESCRIPTION("LED IDE Disk Activity Trigger");
+MODULE_LICENSE("GPL");

diff --git a/include/linux/leds.h b/include/linux/leds.h
index 404575c3dd5a950e3461e770dc1294bb4b46babb..4617e75903b007b411788f0e5fb61156cfd95535 100644 (file)
--- a/include/linux/leds.h
+++ b/include/linux/leds.h
@@ -100,4 +100,12 @@ extern void led_trigger_event(struct led_trigger *trigger,
 #define led_trigger_event(x, y) do {} while(0)
 
 #endif
+
+/* Trigger specific functions */
+#ifdef CONFIG_LEDS_TRIGGER_IDE_DISK
+extern void ledtrig_ide_activity(void);
+#else
+#define ledtrig_ide_activity() do {} while(0)
+#endif
+
 #endif         /* __LINUX_LEDS_H_INCLUDED */