kernel: remove unused morse led trigger driver
authorFelix Fietkau <nbd@nbd.name>
Thu, 4 Aug 2016 17:12:21 +0000 (19:12 +0200)
committerFelix Fietkau <nbd@nbd.name>
Thu, 4 Aug 2016 18:53:02 +0000 (20:53 +0200)
Signed-off-by: Felix Fietkau <nbd@nbd.name>
17 files changed:
package/base-files/files/etc/init.d/led
package/base-files/files/lib/functions/leds.sh
package/kernel/linux/modules/leds.mk
target/linux/adm5120/patches-3.18/009-adm5120_leds_switch_trigger.patch
target/linux/generic/config-3.18
target/linux/generic/config-4.1
target/linux/generic/config-4.4
target/linux/generic/files/drivers/leds/ledtrig-morse.c [deleted file]
target/linux/generic/patches-3.18/830-ledtrig_morse.patch [deleted file]
target/linux/generic/patches-3.18/831-ledtrig_netdev.patch
target/linux/generic/patches-3.18/832-ledtrig_usbdev.patch
target/linux/generic/patches-4.1/830-ledtrig_morse.patch [deleted file]
target/linux/generic/patches-4.1/831-ledtrig_netdev.patch
target/linux/generic/patches-4.1/832-ledtrig_usbdev.patch
target/linux/generic/patches-4.4/830-ledtrig_morse.patch [deleted file]
target/linux/generic/patches-4.4/831-ledtrig_netdev.patch
target/linux/generic/patches-4.4/832-ledtrig_usbdev.patch

index 1d10f723d0ce11bff6828661dfa7385b825791a1..aca0149c245883cfa2e13df2416c3821bbbf8cc2 100755 (executable)
@@ -83,11 +83,6 @@ load_led() {
                                echo $port_state > /sys/class/leds/${sysfs}/port_state
                        ;;
 
-               "morse")
-                       echo $message > /sys/class/leds/${sysfs}/message
-                       echo $delay > /sys/class/leds/${sysfs}/delay
-                       ;;
-
                "gpio")
                        echo $gpio > /sys/class/leds/${sysfs}/gpio
                        echo $inverted > /sys/class/leds/${sysfs}/inverted
index d4d45125c5b402001ceeba00706ef74d152a013e..857e7e53927b04d25b7e54e6e8b3fcdc118d3a9c 100644 (file)
@@ -21,12 +21,6 @@ led_off() {
        led_set_attr $1 "brightness" 0
 }
 
-led_morse() {
-       led_set_attr $1 "trigger" "morse"
-       led_set_attr $1 "delay" "$2"
-       led_set_attr $1 "message" "$3"
-}
-
 status_led_set_timer() {
        led_timer $status_led "$1" "$2"
        [ -n "$status_led2" ] && led_timer $status_led2 "$1" "$2"
@@ -36,11 +30,6 @@ status_led_set_heartbeat() {
        led_set_attr $status_led "trigger" "heartbeat"
 }
 
-status_led_set_morse() {
-       led_morse $status_led "$1" "$2"
-       [ -n "$status_led2" ] && led_morse $status_led2 "$1" "$2"
-}
-
 status_led_on() {
        led_on $status_led
        [ -n "$status_led2" ] && led_on $status_led2
index aea62902ac4fb4957a5bdc78706fff744060f99a..efcb030564421ff5b6d6cd3187fdd1b14b300df1 100644 (file)
@@ -54,21 +54,6 @@ endef
 $(eval $(call KernelPackage,ledtrig-gpio))
 
 
-define KernelPackage/ledtrig-morse
-  SUBMENU:=$(LEDS_MENU)
-  TITLE:=LED Morse Trigger
-  KCONFIG:=CONFIG_LEDS_TRIGGER_MORSE
-  FILES:=$(LINUX_DIR)/drivers/leds/ledtrig-morse.ko
-  AUTOLOAD:=$(call AutoLoad,50,ledtrig-morse)
-endef
-
-define KernelPackage/ledtrig-morse/description
- Kernel module to show morse coded messages on LEDs
-endef
-
-$(eval $(call KernelPackage,ledtrig-morse))
-
-
 define KernelPackage/ledtrig-netdev
   SUBMENU:=$(LEDS_MENU)
   TITLE:=LED NETDEV Trigger
index 627afc1cf85d787e57f5dfd4d9241dbe35055ad7..4b7f532279fc63b2a78bcdcef92b21f574cf235e 100644 (file)
@@ -15,8 +15,8 @@
  endif # NEW_LEDS
 --- a/drivers/leds/Makefile
 +++ b/drivers/leds/Makefile
-@@ -65,3 +65,4 @@ obj-$(CONFIG_LEDS_TRIGGERS)          += trigger/
- obj-$(CONFIG_LEDS_TRIGGER_MORSE)      += ledtrig-morse.o
+@@ -64,3 +64,4 @@ obj-$(CONFIG_LEDS_TRIGGERS)          += trigger/
+ obj-$(CONFIG_LEDS_TRIGGERS)           += trigger/
  obj-$(CONFIG_LEDS_TRIGGER_NETDEV)     += ledtrig-netdev.o
  obj-$(CONFIG_LEDS_TRIGGER_USBDEV)     += ledtrig-usbdev.o
 +obj-$(CONFIG_LEDS_TRIGGER_ADM5120_SWITCH) += ledtrig-adm5120-switch.o
index d862fac0d7f03670d51b4ae1cae03ff861aca48d..92cce060c5dbcffb0bb0a206e65c1be95a1f948d 100644 (file)
@@ -1854,7 +1854,6 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
 # CONFIG_LEDS_TRIGGER_GPIO is not set
 # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
 # CONFIG_LEDS_TRIGGER_IDE_DISK is not set
-# CONFIG_LEDS_TRIGGER_MORSE is not set
 CONFIG_LEDS_TRIGGER_NETDEV=y
 # CONFIG_LEDS_TRIGGER_ONESHOT is not set
 CONFIG_LEDS_TRIGGER_TIMER=y
index 6b92dc70316274a98037d009a3aa1ca997c5499b..3cedf848a6ef3e46fc61358f40223508ce109e2d 100644 (file)
@@ -1927,7 +1927,6 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
 # CONFIG_LEDS_TRIGGER_GPIO is not set
 # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
 # CONFIG_LEDS_TRIGGER_IDE_DISK is not set
-# CONFIG_LEDS_TRIGGER_MORSE is not set
 CONFIG_LEDS_TRIGGER_NETDEV=y
 # CONFIG_LEDS_TRIGGER_ONESHOT is not set
 CONFIG_LEDS_TRIGGER_TIMER=y
index fee51b042cadb2afb6cc3707637fd979dc22cb96..8c3001734a95f363ac20bbc8355d42b3b97ba228 100644 (file)
@@ -1919,7 +1919,6 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
 # CONFIG_LEDS_TRIGGER_GPIO is not set
 # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
 # CONFIG_LEDS_TRIGGER_IDE_DISK is not set
-# CONFIG_LEDS_TRIGGER_MORSE is not set
 CONFIG_LEDS_TRIGGER_NETDEV=y
 # CONFIG_LEDS_TRIGGER_ONESHOT is not set
 CONFIG_LEDS_TRIGGER_TIMER=y
diff --git a/target/linux/generic/files/drivers/leds/ledtrig-morse.c b/target/linux/generic/files/drivers/leds/ledtrig-morse.c
deleted file mode 100644 (file)
index bc58afe..0000000
+++ /dev/null
@@ -1,366 +0,0 @@
-/*
- *  LED Morse Trigger
- *
- *  Copyright (C) 2007 Gabor Juhos <juhosg at openwrt.org>
- *
- *  This file was based on: drivers/led/ledtrig-timer.c
- *     Copyright 2005-2006 Openedhand Ltd.
- *     Author: Richard Purdie <rpurdie@openedhand.com>
- *
- *  also based on the patch '[PATCH] 2.5.59 morse code panics' posted
- *  in the LKML by Tomas Szepe at Thu, 30 Jan 2003
- *     Copyright (C) 2002 Andrew Rodland <arodland@noln.com>
- *     Copyright (C) 2003 Tomas Szepe <szepe@pinerecords.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/kernel.h>
-#include <linux/version.h>
-#include <linux/module.h>
-#include <linux/jiffies.h>
-#include <linux/init.h>
-#include <linux/list.h>
-#include <linux/spinlock.h>
-#include <linux/device.h>
-#include <linux/sysdev.h>
-#include <linux/timer.h>
-#include <linux/ctype.h>
-#include <linux/leds.h>
-#include <linux/slab.h>
-
-#include "leds.h"
-
-#define MORSE_DELAY_BASE       (HZ/2)
-
-#define MORSE_STATE_BLINK_START        0
-#define MORSE_STATE_BLINK_STOP 1
-
-#define MORSE_DIT_LEN  1
-#define MORSE_DAH_LEN  3
-#define MORSE_SPACE_LEN        7
-
-struct morse_trig_data {
-       unsigned long delay;
-       char *msg;
-
-       unsigned char morse;
-       unsigned char state;
-       char *msgpos;
-       struct timer_list timer;
-};
-
-const unsigned char morsetable[] = {
-       0122, 0, 0310, 0, 0, 0163,                              /* "#$%&' */
-       055, 0155, 0, 0, 0163, 0141, 0152, 0051,                /* ()*+,-./ */
-       077, 076, 074, 070, 060, 040, 041, 043, 047, 057,       /* 0-9 */
-       0107, 0125, 0, 0061, 0, 0114, 0,                        /* :;<=>?@ */
-       006, 021, 025, 011, 002, 024, 013, 020, 004,            /* A-I */
-       036, 015, 022, 007, 005, 017, 026, 033, 012,            /* J-R */
-       010, 003, 014, 030, 016, 031, 035, 023,                 /* S-Z */
-       0, 0, 0, 0, 0154                                        /* [\]^_ */
-};
-
-static inline unsigned char tomorse(char c) {
-       if (c >= 'a' && c <= 'z')
-               c = c - 'a' + 'A';
-       if (c >= '"' && c <= '_') {
-               return morsetable[c - '"'];
-       } else
-               return 0;
-}
-
-static inline unsigned long dit_len(struct morse_trig_data *morse_data)
-{
-       return MORSE_DIT_LEN*morse_data->delay;
-}
-
-static inline unsigned long dah_len(struct morse_trig_data *morse_data)
-{
-       return MORSE_DAH_LEN*morse_data->delay;
-}
-
-static inline unsigned long space_len(struct morse_trig_data *morse_data)
-{
-       return MORSE_SPACE_LEN*morse_data->delay;
-}
-
-static void morse_timer_function(unsigned long data)
-{
-       struct led_classdev *led_cdev = (struct led_classdev *)data;
-       struct morse_trig_data *morse_data = led_cdev->trigger_data;
-       unsigned long brightness = LED_OFF;
-       unsigned long delay = 0;
-
-       if (!morse_data->msg)
-               goto set_led;
-
-       switch (morse_data->state) {
-       case MORSE_STATE_BLINK_START:
-               /* Starting a new blink.  We have a valid code in morse. */
-               delay = (morse_data->morse & 001) ? dah_len(morse_data):
-                       dit_len(morse_data);
-               brightness = LED_FULL;
-               morse_data->state = MORSE_STATE_BLINK_STOP;
-               morse_data->morse >>= 1;
-               break;
-       case MORSE_STATE_BLINK_STOP:
-               /* Coming off of a blink. */
-               morse_data->state = MORSE_STATE_BLINK_START;
-
-               if (morse_data->morse > 1) {
-                       /* Not done yet, just a one-dit pause. */
-                       delay = dit_len(morse_data);
-                       break;
-               }
-
-               /* Get a new char, figure out how much space. */
-               /* First time through */
-               if (!morse_data->msgpos)
-                       morse_data->msgpos = (char *)morse_data->msg;
-
-               if (!*morse_data->msgpos) {
-                       /* Repeating */
-                       morse_data->msgpos = (char *)morse_data->msg;
-                       delay = space_len(morse_data);
-               } else {
-                       /* Inter-letter space */
-                       delay = dah_len(morse_data);
-               }
-
-               if (!(morse_data->morse = tomorse(*morse_data->msgpos))) {
-                       delay = space_len(morse_data);
-                       /* And get us back here */
-                       morse_data->state = MORSE_STATE_BLINK_STOP;
-               }
-               morse_data->msgpos++;
-               break;
-       }
-
-       mod_timer(&morse_data->timer, jiffies + msecs_to_jiffies(delay));
-
-set_led:
-       led_set_brightness(led_cdev, brightness);
-}
-
-static ssize_t _morse_delay_show(struct led_classdev *led_cdev, char *buf)
-{
-       struct morse_trig_data *morse_data = led_cdev->trigger_data;
-
-       sprintf(buf, "%lu\n", morse_data->delay);
-
-       return strlen(buf) + 1;
-}
-
-static ssize_t _morse_delay_store(struct led_classdev *led_cdev,
-               const char *buf, size_t size)
-{
-       struct morse_trig_data *morse_data = led_cdev->trigger_data;
-       char *after;
-       unsigned long state = simple_strtoul(buf, &after, 10);
-       size_t count = after - buf;
-       int ret = -EINVAL;
-
-       if (*after && isspace(*after))
-               count++;
-
-       if (count == size) {
-               morse_data->delay = state;
-               mod_timer(&morse_data->timer, jiffies + 1);
-               ret = count;
-       }
-
-       return ret;
-}
-
-static ssize_t _morse_msg_show(struct led_classdev *led_cdev, char *buf)
-{
-       struct morse_trig_data *morse_data = led_cdev->trigger_data;
-
-       if (!morse_data->msg)
-               sprintf(buf, "<none>\n");
-       else
-               sprintf(buf, "%s\n", morse_data->msg);
-
-       return strlen(buf) + 1;
-}
-
-static ssize_t _morse_msg_store(struct led_classdev *led_cdev,
-               const char *buf, size_t size)
-{
-       struct morse_trig_data *morse_data = led_cdev->trigger_data;
-       char *m;
-
-       m = kmalloc(size, GFP_KERNEL);
-       if (!m)
-               return -ENOMEM;
-
-       memcpy(m,buf,size);
-       m[size]='\0';
-
-       if (morse_data->msg)
-               kfree(morse_data->msg);
-
-       morse_data->msg = m;
-       morse_data->msgpos = NULL;
-       morse_data->state = MORSE_STATE_BLINK_STOP;
-
-       mod_timer(&morse_data->timer, jiffies + 1);
-
-       return size;
-}
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23)
-static ssize_t morse_delay_show(struct device *dev,
-               struct device_attribute *attr, char *buf)
-{
-       struct led_classdev *led_cdev = dev_get_drvdata(dev);
-
-       return _morse_delay_show(led_cdev, buf);
-}
-
-static ssize_t morse_delay_store(struct device *dev,
-               struct device_attribute *attr, const char *buf, size_t size)
-{
-       struct led_classdev *led_cdev = dev_get_drvdata(dev);
-
-       return _morse_delay_store(led_cdev, buf, size);
-}
-
-static ssize_t morse_msg_show(struct device *dev,
-               struct device_attribute *attr, char *buf)
-{
-       struct led_classdev *led_cdev = dev_get_drvdata(dev);
-
-       return _morse_msg_show(led_cdev, buf);
-}
-
-static ssize_t morse_msg_store(struct device *dev,
-               struct device_attribute *attr, const char *buf, size_t size)
-{
-       struct led_classdev *led_cdev = dev_get_drvdata(dev);
-
-       return _morse_msg_store(led_cdev, buf, size);
-}
-
-static DEVICE_ATTR(delay, 0644, morse_delay_show, morse_delay_store);
-static DEVICE_ATTR(message, 0644, morse_msg_show, morse_msg_store);
-
-#define led_device_create_file(leddev, attr) \
-       device_create_file(leddev->dev, &dev_attr_ ## attr)
-#define led_device_remove_file(leddev, attr) \
-       device_remove_file(leddev->dev, &dev_attr_ ## attr)
-
-#else
-static ssize_t morse_delay_show(struct class_device *dev, char *buf)
-{
-       struct led_classdev *led_cdev = class_get_devdata(dev);
-
-       return _morse_delay_show(led_cdev, buf);
-}
-
-static ssize_t morse_delay_store(struct class_device *dev, const char *buf,
-               size_t size)
-{
-       struct led_classdev *led_cdev = class_get_devdata(dev);
-
-       return _morse_delay_store(led_cdev, buf, size);
-}
-
-static ssize_t morse_msg_show(struct class_device *dev, char *buf)
-{
-       struct led_classdev *led_cdev = class_get_devdata(dev);
-
-       return _morse_msg_show(led_cdev, buf);
-}
-
-static ssize_t morse_msg_store(struct class_device *dev, const char *buf,
-                               size_t size)
-{
-       struct led_classdev *led_cdev = class_get_devdata(dev);
-
-       return _morse_msg_store(led_cdev, buf, size);
-}
-
-static CLASS_DEVICE_ATTR(delay, 0644, morse_delay_show, morse_delay_store);
-static CLASS_DEVICE_ATTR(message, 0644, morse_msg_show, morse_msg_store);
-
-#define led_device_create_file(leddev, attr) \
-       class_device_create_file(leddev->class_dev, &class_device_attr_ ## attr)
-#define led_device_remove_file(leddev, attr) \
-       class_device_remove_file(leddev->class_dev, &class_device_attr_ ## attr)
-
-#endif
-
-static void morse_trig_activate(struct led_classdev *led_cdev)
-{
-       struct morse_trig_data *morse_data;
-       int rc;
-
-       morse_data = kzalloc(sizeof(*morse_data), GFP_KERNEL);
-       if (!morse_data)
-               return;
-
-       morse_data->delay = MORSE_DELAY_BASE;
-       init_timer(&morse_data->timer);
-       morse_data->timer.function = morse_timer_function;
-       morse_data->timer.data = (unsigned long)led_cdev;
-
-       rc = led_device_create_file(led_cdev, delay);
-       if (rc) goto err;
-
-       rc = led_device_create_file(led_cdev, message);
-       if (rc) goto err_delay;
-
-       led_cdev->trigger_data = morse_data;
-
-       return;
-
-err_delay:
-       led_device_remove_file(led_cdev, delay);
-err:
-       kfree(morse_data);
-}
-
-static void morse_trig_deactivate(struct led_classdev *led_cdev)
-{
-       struct morse_trig_data *morse_data = led_cdev->trigger_data;
-
-       if (!morse_data)
-               return;
-
-       led_device_remove_file(led_cdev, message);
-       led_device_remove_file(led_cdev, delay);
-
-       del_timer_sync(&morse_data->timer);
-       if (morse_data->msg)
-               kfree(morse_data->msg);
-
-       kfree(morse_data);
-}
-
-static struct led_trigger morse_led_trigger = {
-       .name           = "morse",
-       .activate       = morse_trig_activate,
-       .deactivate     = morse_trig_deactivate,
-};
-
-static int __init morse_trig_init(void)
-{
-       return led_trigger_register(&morse_led_trigger);
-}
-
-static void __exit morse_trig_exit(void)
-{
-       led_trigger_unregister(&morse_led_trigger);
-}
-
-module_init(morse_trig_init);
-module_exit(morse_trig_exit);
-
-MODULE_AUTHOR("Gabor Juhos <juhosg at openwrt.org>");
-MODULE_DESCRIPTION("Morse LED trigger");
-MODULE_LICENSE("GPL");
diff --git a/target/linux/generic/patches-3.18/830-ledtrig_morse.patch b/target/linux/generic/patches-3.18/830-ledtrig_morse.patch
deleted file mode 100644 (file)
index a41facc..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/drivers/leds/trigger/Kconfig
-+++ b/drivers/leds/trigger/Kconfig
-@@ -108,4 +108,8 @@ config LEDS_TRIGGER_CAMERA
-         This enables direct flash/torch on/off by the driver, kernel space.
-         If unsure, say Y.
-+config LEDS_TRIGGER_MORSE
-+      tristate "LED Morse Trigger"
-+      depends on LEDS_TRIGGERS
-+
- endif # LEDS_TRIGGERS
---- a/drivers/leds/Makefile
-+++ b/drivers/leds/Makefile
-@@ -62,3 +62,4 @@ obj-$(CONFIG_LEDS_DAC124S085)                += leds-d
- # LED Triggers
- obj-$(CONFIG_LEDS_TRIGGERS)           += trigger/
-+obj-$(CONFIG_LEDS_TRIGGER_MORSE)      += ledtrig-morse.o
---- a/drivers/leds/ledtrig-morse.c
-+++ b/drivers/leds/ledtrig-morse.c
-@@ -26,7 +26,6 @@
- #include <linux/list.h>
- #include <linux/spinlock.h>
- #include <linux/device.h>
--#include <linux/sysdev.h>
- #include <linux/timer.h>
- #include <linux/ctype.h>
- #include <linux/leds.h>
index ad9637620aa6db2fc7df6ed6a4052a610ba05479..3b46b4a9f4d4e1f9801f192366ff118044ca82be 100644 (file)
@@ -1,8 +1,8 @@
 --- a/drivers/leds/trigger/Kconfig
 +++ b/drivers/leds/trigger/Kconfig
-@@ -112,4 +112,11 @@ config LEDS_TRIGGER_MORSE
-       tristate "LED Morse Trigger"
-       depends on LEDS_TRIGGERS
+@@ -108,4 +108,11 @@ config LEDS_TRIGGER_CAMERA
+         This enables direct flash/torch on/off by the driver, kernel space.
+         If unsure, say Y.
  
 +config LEDS_TRIGGER_NETDEV
 +      tristate "LED Netdev Trigger"
@@ -14,8 +14,8 @@
  endif # LEDS_TRIGGERS
 --- a/drivers/leds/Makefile
 +++ b/drivers/leds/Makefile
-@@ -63,3 +63,4 @@ obj-$(CONFIG_LEDS_DAC124S085)                += leds-d
+@@ -62,3 +62,4 @@ obj-$(CONFIG_LEDS_DAC124S085)                += leds-d
  # LED Triggers
  obj-$(CONFIG_LEDS_TRIGGERS)           += trigger/
- obj-$(CONFIG_LEDS_TRIGGER_MORSE)      += ledtrig-morse.o
 +obj-$(CONFIG_LEDS_TRIGGER_NETDEV)     += ledtrig-netdev.o
index d8c94928713acffbe5d8fcbd448504df28d03bf0..b3dbc57060e1673032a2c19c72353d57b2e3edf4 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/leds/trigger/Kconfig
 +++ b/drivers/leds/trigger/Kconfig
-@@ -119,4 +119,11 @@ config LEDS_TRIGGER_NETDEV
+@@ -115,4 +115,11 @@ config LEDS_TRIGGER_NETDEV
          This allows LEDs to be controlled by network device activity.
          If unsure, say Y.
  
@@ -14,9 +14,9 @@
  endif # LEDS_TRIGGERS
 --- a/drivers/leds/Makefile
 +++ b/drivers/leds/Makefile
-@@ -64,3 +64,4 @@ obj-$(CONFIG_LEDS_DAC124S085)                += leds-d
+@@ -63,3 +63,4 @@ obj-$(CONFIG_LEDS_DAC124S085)                += leds-d
+ # LED Triggers
  obj-$(CONFIG_LEDS_TRIGGERS)           += trigger/
- obj-$(CONFIG_LEDS_TRIGGER_MORSE)      += ledtrig-morse.o
  obj-$(CONFIG_LEDS_TRIGGER_NETDEV)     += ledtrig-netdev.o
 +obj-$(CONFIG_LEDS_TRIGGER_USBDEV)     += ledtrig-usbdev.o
 --- a/drivers/leds/ledtrig-usbdev.c
diff --git a/target/linux/generic/patches-4.1/830-ledtrig_morse.patch b/target/linux/generic/patches-4.1/830-ledtrig_morse.patch
deleted file mode 100644 (file)
index 31b5781..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/drivers/leds/trigger/Kconfig
-+++ b/drivers/leds/trigger/Kconfig
-@@ -108,4 +108,8 @@ config LEDS_TRIGGER_CAMERA
-         This enables direct flash/torch on/off by the driver, kernel space.
-         If unsure, say Y.
-+config LEDS_TRIGGER_MORSE
-+      tristate "LED Morse Trigger"
-+      depends on LEDS_TRIGGERS
-+
- endif # LEDS_TRIGGERS
---- a/drivers/leds/Makefile
-+++ b/drivers/leds/Makefile
-@@ -65,3 +65,4 @@ obj-$(CONFIG_LEDS_DAC124S085)                += leds-d
- # LED Triggers
- obj-$(CONFIG_LEDS_TRIGGERS)           += trigger/
-+obj-$(CONFIG_LEDS_TRIGGER_MORSE)      += ledtrig-morse.o
---- a/drivers/leds/ledtrig-morse.c
-+++ b/drivers/leds/ledtrig-morse.c
-@@ -26,7 +26,6 @@
- #include <linux/list.h>
- #include <linux/spinlock.h>
- #include <linux/device.h>
--#include <linux/sysdev.h>
- #include <linux/timer.h>
- #include <linux/ctype.h>
- #include <linux/leds.h>
index 571c6dd5ac468b8e72b528df6fb18b183065cf65..f6f1f51b93959fff9c2f67247ac70aacc10c1375 100644 (file)
@@ -1,8 +1,8 @@
 --- a/drivers/leds/trigger/Kconfig
 +++ b/drivers/leds/trigger/Kconfig
-@@ -112,4 +112,11 @@ config LEDS_TRIGGER_MORSE
-       tristate "LED Morse Trigger"
-       depends on LEDS_TRIGGERS
+@@ -108,4 +108,11 @@ config LEDS_TRIGGER_CAMERA
+         This enables direct flash/torch on/off by the driver, kernel space.
+         If unsure, say Y.
  
 +config LEDS_TRIGGER_NETDEV
 +      tristate "LED Netdev Trigger"
@@ -14,8 +14,8 @@
  endif # LEDS_TRIGGERS
 --- a/drivers/leds/Makefile
 +++ b/drivers/leds/Makefile
-@@ -66,3 +66,4 @@ obj-$(CONFIG_LEDS_DAC124S085)                += leds-d
+@@ -65,3 +65,4 @@ obj-$(CONFIG_LEDS_DAC124S085)                += leds-d
  # LED Triggers
  obj-$(CONFIG_LEDS_TRIGGERS)           += trigger/
- obj-$(CONFIG_LEDS_TRIGGER_MORSE)      += ledtrig-morse.o
 +obj-$(CONFIG_LEDS_TRIGGER_NETDEV)     += ledtrig-netdev.o
index 564aab5d9ac39d6059b26cdf194c3db88df53f36..b83efd29bfe656aa437925e41891ead4ab2bea7a 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/leds/trigger/Kconfig
 +++ b/drivers/leds/trigger/Kconfig
-@@ -119,4 +119,11 @@ config LEDS_TRIGGER_NETDEV
+@@ -115,4 +115,11 @@ config LEDS_TRIGGER_NETDEV
          This allows LEDs to be controlled by network device activity.
          If unsure, say Y.
  
@@ -14,9 +14,9 @@
  endif # LEDS_TRIGGERS
 --- a/drivers/leds/Makefile
 +++ b/drivers/leds/Makefile
-@@ -67,3 +67,4 @@ obj-$(CONFIG_LEDS_DAC124S085)                += leds-d
+@@ -66,3 +66,4 @@ obj-$(CONFIG_LEDS_DAC124S085)                += leds-d
+ # LED Triggers
  obj-$(CONFIG_LEDS_TRIGGERS)           += trigger/
- obj-$(CONFIG_LEDS_TRIGGER_MORSE)      += ledtrig-morse.o
  obj-$(CONFIG_LEDS_TRIGGER_NETDEV)     += ledtrig-netdev.o
 +obj-$(CONFIG_LEDS_TRIGGER_USBDEV)     += ledtrig-usbdev.o
 --- a/drivers/leds/ledtrig-usbdev.c
diff --git a/target/linux/generic/patches-4.4/830-ledtrig_morse.patch b/target/linux/generic/patches-4.4/830-ledtrig_morse.patch
deleted file mode 100644 (file)
index 19a4560..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/drivers/leds/trigger/Kconfig
-+++ b/drivers/leds/trigger/Kconfig
-@@ -108,4 +108,8 @@ config LEDS_TRIGGER_CAMERA
-         This enables direct flash/torch on/off by the driver, kernel space.
-         If unsure, say Y.
-+config LEDS_TRIGGER_MORSE
-+      tristate "LED Morse Trigger"
-+      depends on LEDS_TRIGGERS
-+
- endif # LEDS_TRIGGERS
---- a/drivers/leds/Makefile
-+++ b/drivers/leds/Makefile
-@@ -72,3 +72,4 @@ obj-$(CONFIG_LEDS_DAC124S085)                += leds-d
- # LED Triggers
- obj-$(CONFIG_LEDS_TRIGGERS)           += trigger/
-+obj-$(CONFIG_LEDS_TRIGGER_MORSE)      += ledtrig-morse.o
---- a/drivers/leds/ledtrig-morse.c
-+++ b/drivers/leds/ledtrig-morse.c
-@@ -26,7 +26,6 @@
- #include <linux/list.h>
- #include <linux/spinlock.h>
- #include <linux/device.h>
--#include <linux/sysdev.h>
- #include <linux/timer.h>
- #include <linux/ctype.h>
- #include <linux/leds.h>
index c87f54684bd3e9f28f72df30817c36fd5d48cd95..a28de899ac23cb9535078fd2bd5409f012c66fea 100644 (file)
@@ -1,8 +1,8 @@
 --- a/drivers/leds/trigger/Kconfig
 +++ b/drivers/leds/trigger/Kconfig
-@@ -112,4 +112,11 @@ config LEDS_TRIGGER_MORSE
-       tristate "LED Morse Trigger"
-       depends on LEDS_TRIGGERS
+@@ -108,4 +108,11 @@ config LEDS_TRIGGER_CAMERA
+         This enables direct flash/torch on/off by the driver, kernel space.
+         If unsure, say Y.
  
 +config LEDS_TRIGGER_NETDEV
 +      tristate "LED Netdev Trigger"
@@ -14,8 +14,8 @@
  endif # LEDS_TRIGGERS
 --- a/drivers/leds/Makefile
 +++ b/drivers/leds/Makefile
-@@ -73,3 +73,4 @@ obj-$(CONFIG_LEDS_DAC124S085)                += leds-d
+@@ -72,3 +72,4 @@ obj-$(CONFIG_LEDS_DAC124S085)                += leds-d
  # LED Triggers
  obj-$(CONFIG_LEDS_TRIGGERS)           += trigger/
- obj-$(CONFIG_LEDS_TRIGGER_MORSE)      += ledtrig-morse.o
 +obj-$(CONFIG_LEDS_TRIGGER_NETDEV)     += ledtrig-netdev.o
index f6181b794c3b142d4bed2bf57fc7e3a15e370048..73bbb2ead56ba250112a871623a4c71fb36289a4 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/leds/trigger/Kconfig
 +++ b/drivers/leds/trigger/Kconfig
-@@ -119,4 +119,11 @@ config LEDS_TRIGGER_NETDEV
+@@ -115,4 +115,11 @@ config LEDS_TRIGGER_NETDEV
          This allows LEDs to be controlled by network device activity.
          If unsure, say Y.
  
@@ -14,9 +14,9 @@
  endif # LEDS_TRIGGERS
 --- a/drivers/leds/Makefile
 +++ b/drivers/leds/Makefile
-@@ -74,3 +74,4 @@ obj-$(CONFIG_LEDS_DAC124S085)                += leds-d
+@@ -73,3 +73,4 @@ obj-$(CONFIG_LEDS_DAC124S085)                += leds-d
+ # LED Triggers
  obj-$(CONFIG_LEDS_TRIGGERS)           += trigger/
- obj-$(CONFIG_LEDS_TRIGGER_MORSE)      += ledtrig-morse.o
  obj-$(CONFIG_LEDS_TRIGGER_NETDEV)     += ledtrig-netdev.o
 +obj-$(CONFIG_LEDS_TRIGGER_USBDEV)     += ledtrig-usbdev.o
 --- a/drivers/leds/ledtrig-usbdev.c