Skip to content

Commit

Permalink
backlight: use kstrtoul()
Browse files Browse the repository at this point in the history
The usage of simple_strtoul() or strict_strtoul() is not preferred.  Thus,
kstrtoul should be used.

This patch also fixes checkpatch error as follows:
ERROR: space required after that ',' (ctx:VxV)

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Cc: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Jingoo Han authored and Linus Torvalds committed Jan 11, 2012
1 parent 1cfc6fe commit 6665576
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 19 deletions.
6 changes: 3 additions & 3 deletions drivers/video/backlight/backlight.c
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ static void backlight_generate_event(struct backlight_device *bd,
}

static ssize_t backlight_show_power(struct device *dev,
struct device_attribute *attr,char *buf)
struct device_attribute *attr, char *buf)
{
struct backlight_device *bd = to_backlight_device(dev);

Expand All @@ -116,7 +116,7 @@ static ssize_t backlight_store_power(struct device *dev,
struct backlight_device *bd = to_backlight_device(dev);
unsigned long power;

rc = strict_strtoul(buf, 0, &power);
rc = kstrtoul(buf, 0, &power);
if (rc)
return rc;

Expand Down Expand Up @@ -150,7 +150,7 @@ static ssize_t backlight_store_brightness(struct device *dev,
struct backlight_device *bd = to_backlight_device(dev);
unsigned long brightness;

rc = strict_strtoul(buf, 0, &brightness);
rc = kstrtoul(buf, 0, &brightness);
if (rc)
return rc;

Expand Down
26 changes: 10 additions & 16 deletions drivers/video/backlight/lcd.c
Original file line number Diff line number Diff line change
Expand Up @@ -97,19 +97,16 @@ static ssize_t lcd_store_power(struct device *dev,
struct device_attribute *attr, const char *buf, size_t count)
{
int rc = -ENXIO;
char *endp;
struct lcd_device *ld = to_lcd_device(dev);
int power = simple_strtoul(buf, &endp, 0);
size_t size = endp - buf;
unsigned long power;

if (isspace(*endp))
size++;
if (size != count)
return -EINVAL;
rc = kstrtoul(buf, 0, &power);
if (rc)
return rc;

mutex_lock(&ld->ops_lock);
if (ld->ops && ld->ops->set_power) {
pr_debug("lcd: set power to %d\n", power);
pr_debug("lcd: set power to %lu\n", power);
ld->ops->set_power(ld, power);
rc = count;
}
Expand All @@ -136,19 +133,16 @@ static ssize_t lcd_store_contrast(struct device *dev,
struct device_attribute *attr, const char *buf, size_t count)
{
int rc = -ENXIO;
char *endp;
struct lcd_device *ld = to_lcd_device(dev);
int contrast = simple_strtoul(buf, &endp, 0);
size_t size = endp - buf;
unsigned long contrast;

if (isspace(*endp))
size++;
if (size != count)
return -EINVAL;
rc = kstrtoul(buf, 0, &contrast);
if (rc)
return rc;

mutex_lock(&ld->ops_lock);
if (ld->ops && ld->ops->set_contrast) {
pr_debug("lcd: set contrast to %d\n", contrast);
pr_debug("lcd: set contrast to %lu\n", contrast);
ld->ops->set_contrast(ld, contrast);
rc = count;
}
Expand Down

0 comments on commit 6665576

Please sign in to comment.