From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Jacek Anaszewski <jacek.anaszewski@gmail.com>,
Pavel Machek <pavel@ucw.cz>, Dan Murphy <dmurphy@ti.com>,
linux-leds@vger.kernel.org
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCH v2 2/2] leds: trigger: gpio: Convert to use kstrtox()
Date: Fri, 30 Aug 2019 18:08:20 +0300 [thread overview]
Message-ID: <20190830150820.63450-2-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20190830150820.63450-1-andriy.shevchenko@linux.intel.com>
sscanf() is a heavy one and moreover requires additional boundary checks.
Convert driver to use kstrtox() and replace kstrtoul() by kstrtobool()
in gpio_trig_inverted_store().
While here, check the desired brightness against maximum defined for
a certain LED.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
- check against max_brightness (Jacek)
drivers/leds/trigger/ledtrig-gpio.c | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/drivers/leds/trigger/ledtrig-gpio.c b/drivers/leds/trigger/ledtrig-gpio.c
index dc64679b1a92..2d70c35588cb 100644
--- a/drivers/leds/trigger/ledtrig-gpio.c
+++ b/drivers/leds/trigger/ledtrig-gpio.c
@@ -60,10 +60,10 @@ static ssize_t gpio_trig_brightness_store(struct device *dev,
unsigned desired_brightness;
int ret;
- ret = sscanf(buf, "%u", &desired_brightness);
- if (ret < 1 || desired_brightness > 255) {
+ ret = kstrtouint(buf, 10, &desired_brightness);
+ if (ret || desired_brightness > gpio_data->led->max_brightness) {
dev_err(dev, "invalid value\n");
- return -EINVAL;
+ return ret ? ret : -EINVAL;
}
gpio_data->desired_brightness = desired_brightness;
@@ -86,16 +86,13 @@ static ssize_t gpio_trig_inverted_store(struct device *dev,
{
struct led_classdev *led = led_trigger_get_led(dev);
struct gpio_trig_data *gpio_data = led_trigger_get_drvdata(dev);
- unsigned long inverted;
+ bool inverted;
int ret;
- ret = kstrtoul(buf, 10, &inverted);
- if (ret < 0)
+ ret = kstrtobool(buf, &inverted);
+ if (ret)
return ret;
- if (inverted > 1)
- return -EINVAL;
-
gpio_data->inverted = inverted;
/* After inverting, we need to update the LED. */
@@ -122,10 +119,10 @@ static ssize_t gpio_trig_gpio_store(struct device *dev,
unsigned gpio;
int ret;
- ret = sscanf(buf, "%u", &gpio);
- if (ret < 1) {
+ ret = kstrtouint(buf, 10, &gpio);
+ if (ret) {
dev_err(dev, "couldn't read gpio number\n");
- return -EINVAL;
+ return ret;
}
if (gpio_data->gpio == gpio)
--
2.23.0.rc1
next prev parent reply other threads:[~2019-08-30 15:08 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-30 15:08 [PATCH v2 1/2] leds: trigger: gpio: GPIO 0 is valid Andy Shevchenko
2019-08-30 15:08 ` Andy Shevchenko [this message]
2019-09-01 10:23 ` [PATCH v2 2/2] leds: trigger: gpio: Convert to use kstrtox() Pavel Machek
2019-09-01 11:36 ` Jacek Anaszewski
2019-09-01 11:41 ` Jacek Anaszewski
2019-09-02 10:08 ` Andy Shevchenko
2019-08-30 21:11 ` [PATCH v2 1/2] leds: trigger: gpio: GPIO 0 is valid Jacek Anaszewski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190830150820.63450-2-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=dmurphy@ti.com \
--cc=jacek.anaszewski@gmail.com \
--cc=linux-leds@vger.kernel.org \
--cc=pavel@ucw.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox