Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 66655760 authored by Jingoo Han's avatar Jingoo Han Committed by Linus Torvalds
Browse files

backlight: use kstrtoul() 



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: default avatarJingoo Han <jg1.han@samsung.com>
Cc: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1cfc6fee

drivers/video/backlight/backlight.c

+3 −3
Original line number Diff line number Diff line
@@ -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;
@@ -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;

drivers/video/backlight/lcd.c

+10 −16
Original line number Diff line number Diff line
@@ -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;

	}
@@ -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;

	}