coding style cleanups, drop old kernel support
Signed-off-by: Imre Kaloz <kaloz@openwrt.org> SVN-Revision: 41293
This commit is contained in:
		@@ -27,11 +27,6 @@
 | 
			
		||||
#include <linux/timer.h>
 | 
			
		||||
#include <linux/ctype.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"
 | 
			
		||||
 | 
			
		||||
@@ -115,10 +110,6 @@ static ssize_t led_device_name_show(struct device *dev,
 | 
			
		||||
	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,
 | 
			
		||||
		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) {
 | 
			
		||||
		/* 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);
 | 
			
		||||
#else
 | 
			
		||||
		trigger_data->net_dev = dev_get_by_name(trigger_data->device_name);
 | 
			
		||||
#endif
 | 
			
		||||
		if (trigger_data->net_dev != NULL)
 | 
			
		||||
			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 */
 | 
			
		||||
@@ -246,14 +233,14 @@ static ssize_t led_interval_store(struct device *dev,
 | 
			
		||||
	unsigned long value = simple_strtoul(buf, &after, 10);
 | 
			
		||||
	size_t count = after - buf;
 | 
			
		||||
 | 
			
		||||
	if (*after && isspace(*after))
 | 
			
		||||
	if (isspace(*after))
 | 
			
		||||
		count++;
 | 
			
		||||
 | 
			
		||||
	/* impose some basic bounds on the timer interval */
 | 
			
		||||
	if (count == size && value >= 5 && value <= 10000) {
 | 
			
		||||
		write_lock(&trigger_data->lock);
 | 
			
		||||
		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);
 | 
			
		||||
		ret = count;
 | 
			
		||||
	}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user