Skip to content

Commit

Permalink
leds: Remove uneeded strlen calls
Browse files Browse the repository at this point in the history
There's no need for the additional call to strlen(), we can directly
return the value returned by sprintf().  We now return a length value
that doesn't include the final '\0', but user space shouldn't bother
about it anyway.

Signed-off-by: Sven Wegener <sven.wegener@stealer.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
  • Loading branch information
Sven Wegener authored and Richard Purdie committed Oct 20, 2008
1 parent 6af4f55 commit dd8e5a2
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 10 deletions.
5 changes: 1 addition & 4 deletions drivers/leds/led-class.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
8 changes: 2 additions & 6 deletions drivers/leds/ledtrig-timer.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit dd8e5a2

Please sign in to comment.