RepoMirrors/openwrt
1
0
Fork 0
mirror of git://git.openwrt.org/openwrt/openwrt.git synced 2025-01-25 16:12:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

coding style cleanups, drop old kernel support

Browse Source 
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>

SVN-Revision: 41293
This commit is contained in:
Imre Kaloz 2014-06-21 10:00:07 +00:00
parent 643a8a626d
commit e1de4e27c1
1 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
target/linux/generic/files/drivers/leds/ledtrig-netdev.c
View File

@ -27,11 +27,6 @@
#include <linux/timer.h> #include <linux/timer.h>
#include <linux/ctype.h> #include <linux/ctype.h>
#include <linux/leds.h> #include <linux/leds.h>
#include <linux/version.h>
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
#include <net/net_namespace.h>
#endif
#include "leds.h" #include "leds.h"
@ -115,10 +110,6 @@ static ssize_t led_device_name_show(struct device *dev,
return strlen(buf) + 1; return strlen(buf) + 1;
} }
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21)
extern struct net init_net;
#endif
static ssize_t led_device_name_store(struct device *dev, static ssize_t led_device_name_store(struct device *dev,
struct device_attribute *attr, const char *buf, size_t size) struct device_attribute *attr, const char *buf, size_t size)
{ {
@ -136,11 +127,7 @@ static ssize_t led_device_name_store(struct device *dev,
if (trigger_data->device_name[0] != 0) { if (trigger_data->device_name[0] != 0) {
/* check for existing device to update from */ /* check for existing device to update from */
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
trigger_data->net_dev = dev_get_by_name(&init_net, trigger_data->device_name); trigger_data->net_dev = dev_get_by_name(&init_net, trigger_data->device_name);
#else
trigger_data->net_dev = dev_get_by_name(trigger_data->device_name);
#endif
if (trigger_data->net_dev != NULL) if (trigger_data->net_dev != NULL)
trigger_data->link_up = (dev_get_flags(trigger_data->net_dev) & IFF_LOWER_UP) != 0; trigger_data->link_up = (dev_get_flags(trigger_data->net_dev) & IFF_LOWER_UP) != 0;
set_baseline_state(trigger_data); /* updates LEDs, may start timers */ set_baseline_state(trigger_data); /* updates LEDs, may start timers */
@ -246,14 +233,14 @@ static ssize_t led_interval_store(struct device *dev,
unsigned long value = simple_strtoul(buf, &after, 10); unsigned long value = simple_strtoul(buf, &after, 10);
size_t count = after - buf; size_t count = after - buf;
if (*after && isspace(*after)) if (isspace(*after))
count++; count++;
/* impose some basic bounds on the timer interval */ /* impose some basic bounds on the timer interval */
if (count == size && value >= 5 && value <= 10000) { if (count == size && value >= 5 && value <= 10000) {
write_lock(&trigger_data->lock); write_lock(&trigger_data->lock);
trigger_data->interval = msecs_to_jiffies(value); trigger_data->interval = msecs_to_jiffies(value);
set_baseline_state(trigger_data); // resets timer set_baseline_state(trigger_data); /* resets timer */
write_unlock(&trigger_data->lock); write_unlock(&trigger_data->lock);
ret = count; ret = count;
} }