From 375f2f176bd9f7f1abd13c68911f82218a88d6e8 Mon Sep 17 00:00:00 2001 From: Sven Wegener Date: Mon, 13 Oct 2008 10:41:39 +0100 Subject: [PATCH] --- yaml --- r: 117744 b: refs/heads/master c: dd8e5a2039607e0f79c33549726a2415d977c938 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/leds/led-class.c | 5 +---- trunk/drivers/leds/ledtrig-timer.c | 8 ++------ 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 143ccd0e5d64..4cb94beb3f06 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6af4f55c31764c2d97ddf59ae2149cd1769e2e25 +refs/heads/master: dd8e5a2039607e0f79c33549726a2415d977c938 diff --git a/trunk/drivers/leds/led-class.c b/trunk/drivers/leds/led-class.c index ee74ee7b2acc..8a7d138ec503 100644 --- a/trunk/drivers/leds/led-class.c +++ b/trunk/drivers/leds/led-class.c @@ -34,14 +34,11 @@ static ssize_t led_brightness_show(struct device *dev, struct device_attribute *attr, char *buf) { struct led_classdev *led_cdev = dev_get_drvdata(dev); - ssize_t ret = 0; /* no lock needed for this */ led_update_brightness(led_cdev); - sprintf(buf, "%u\n", led_cdev->brightness); - ret = strlen(buf) + 1; - return ret; + return sprintf(buf, "%u\n", led_cdev->brightness); } static ssize_t led_brightness_store(struct device *dev, diff --git a/trunk/drivers/leds/ledtrig-timer.c b/trunk/drivers/leds/ledtrig-timer.c index 5c99f4f0c692..db681962d7bb 100644 --- a/trunk/drivers/leds/ledtrig-timer.c +++ b/trunk/drivers/leds/ledtrig-timer.c @@ -70,9 +70,7 @@ static ssize_t led_delay_on_show(struct device *dev, struct led_classdev *led_cdev = dev_get_drvdata(dev); struct timer_trig_data *timer_data = led_cdev->trigger_data; - sprintf(buf, "%lu\n", timer_data->delay_on); - - return strlen(buf) + 1; + return sprintf(buf, "%lu\n", timer_data->delay_on); } static ssize_t led_delay_on_store(struct device *dev, @@ -116,9 +114,7 @@ static ssize_t led_delay_off_show(struct device *dev, struct led_classdev *led_cdev = dev_get_drvdata(dev); struct timer_trig_data *timer_data = led_cdev->trigger_data; - sprintf(buf, "%lu\n", timer_data->delay_off); - - return strlen(buf) + 1; + return sprintf(buf, "%lu\n", timer_data->delay_off); } static ssize_t led_delay_off_store(struct device *dev,