From: Markus Pargmann <mpa@pengutronix.de> To: Linus Walleij <linus.walleij@linaro.org> Cc: Alexandre Courbot <gnurou@gmail.com>, linux-gpio@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kernel@pengutronix.de, Markus Pargmann <mpa@pengutronix.de> Subject: [PATCH 7/9] gpiolib-sysfs: Add gpio name parsing for sysfs export Date: Fri, 17 Jul 2015 11:32:48 +0200 [thread overview] Message-ID: <1437125570-28623-8-git-send-email-mpa@pengutronix.de> (raw) In-Reply-To: <1437125570-28623-1-git-send-email-mpa@pengutronix.de> Signed-off-by: Markus Pargmann <mpa@pengutronix.de> --- drivers/gpio/gpiolib-sysfs.c | 41 ++++++++++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/drivers/gpio/gpiolib-sysfs.c b/drivers/gpio/gpiolib-sysfs.c index b57ed8e55ab5..c3b74440ca67 100644 --- a/drivers/gpio/gpiolib-sysfs.c +++ b/drivers/gpio/gpiolib-sysfs.c @@ -443,18 +443,25 @@ static ssize_t export_store(struct class *class, const char *buf, size_t len) { long gpio; - struct gpio_desc *desc; + struct gpio_desc *desc = NULL; int status; status = kstrtol(buf, 0, &gpio); - if (status < 0) - goto done; + if (!status) + desc = gpio_to_desc(gpio); - desc = gpio_to_desc(gpio); - /* reject invalid GPIOs */ + /* Fall back on detection by name */ if (!desc) { - pr_warn("%s: invalid GPIO %ld\n", __func__, gpio); - return -EINVAL; + char *gpio_name = kstrdup(buf, GFP_KERNEL); + + desc = gpio_name_to_desc(strim(gpio_name)); + kfree(gpio_name); + + /* reject invalid GPIOs */ + if (!desc) { + pr_warn("%s: invalid GPIO %s\n", __func__, buf); + return -EINVAL; + } } /* No extra locking here; FLAG_SYSFS just signifies that the @@ -485,17 +492,25 @@ static ssize_t unexport_store(struct class *class, const char *buf, size_t len) { long gpio; - struct gpio_desc *desc; + struct gpio_desc *desc = NULL; int status; status = kstrtol(buf, 0, &gpio); - if (status < 0) - goto done; + if (!status) + desc = gpio_to_desc(gpio); + + /* Fall back on detection by name */ + if (!desc) { + char *gpio_name = kstrdup(buf, GFP_KERNEL); + + desc = gpio_name_to_desc(strim(gpio_name)); + kfree(gpio_name); + } + - desc = gpio_to_desc(gpio); /* reject bogus commands (gpio_unexport ignores them) */ if (!desc) { - pr_warn("%s: invalid GPIO %ld\n", __func__, gpio); + pr_warn("%s: invalid GPIO %s\n", __func__, buf); return -EINVAL; } @@ -509,7 +524,7 @@ static ssize_t unexport_store(struct class *class, status = 0; gpiod_free(desc); } -done: + if (status) pr_debug("%s: status %d\n", __func__, status); return status ? : len; -- 2.1.4
WARNING: multiple messages have this Message-ID (diff)
From: mpa@pengutronix.de (Markus Pargmann) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 7/9] gpiolib-sysfs: Add gpio name parsing for sysfs export Date: Fri, 17 Jul 2015 11:32:48 +0200 [thread overview] Message-ID: <1437125570-28623-8-git-send-email-mpa@pengutronix.de> (raw) In-Reply-To: <1437125570-28623-1-git-send-email-mpa@pengutronix.de> Signed-off-by: Markus Pargmann <mpa@pengutronix.de> --- drivers/gpio/gpiolib-sysfs.c | 41 ++++++++++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/drivers/gpio/gpiolib-sysfs.c b/drivers/gpio/gpiolib-sysfs.c index b57ed8e55ab5..c3b74440ca67 100644 --- a/drivers/gpio/gpiolib-sysfs.c +++ b/drivers/gpio/gpiolib-sysfs.c @@ -443,18 +443,25 @@ static ssize_t export_store(struct class *class, const char *buf, size_t len) { long gpio; - struct gpio_desc *desc; + struct gpio_desc *desc = NULL; int status; status = kstrtol(buf, 0, &gpio); - if (status < 0) - goto done; + if (!status) + desc = gpio_to_desc(gpio); - desc = gpio_to_desc(gpio); - /* reject invalid GPIOs */ + /* Fall back on detection by name */ if (!desc) { - pr_warn("%s: invalid GPIO %ld\n", __func__, gpio); - return -EINVAL; + char *gpio_name = kstrdup(buf, GFP_KERNEL); + + desc = gpio_name_to_desc(strim(gpio_name)); + kfree(gpio_name); + + /* reject invalid GPIOs */ + if (!desc) { + pr_warn("%s: invalid GPIO %s\n", __func__, buf); + return -EINVAL; + } } /* No extra locking here; FLAG_SYSFS just signifies that the @@ -485,17 +492,25 @@ static ssize_t unexport_store(struct class *class, const char *buf, size_t len) { long gpio; - struct gpio_desc *desc; + struct gpio_desc *desc = NULL; int status; status = kstrtol(buf, 0, &gpio); - if (status < 0) - goto done; + if (!status) + desc = gpio_to_desc(gpio); + + /* Fall back on detection by name */ + if (!desc) { + char *gpio_name = kstrdup(buf, GFP_KERNEL); + + desc = gpio_name_to_desc(strim(gpio_name)); + kfree(gpio_name); + } + - desc = gpio_to_desc(gpio); /* reject bogus commands (gpio_unexport ignores them) */ if (!desc) { - pr_warn("%s: invalid GPIO %ld\n", __func__, gpio); + pr_warn("%s: invalid GPIO %s\n", __func__, buf); return -EINVAL; } @@ -509,7 +524,7 @@ static ssize_t unexport_store(struct class *class, status = 0; gpiod_free(desc); } -done: + if (status) pr_debug("%s: status %d\n", __func__, status); return status ? : len; -- 2.1.4
next prev parent reply other threads:[~2015-07-17 9:33 UTC|newest] Thread overview: 84+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-07-17 9:32 [PATCH 0/9] gpiolib: Add GPIO name support Markus Pargmann 2015-07-17 9:32 ` Markus Pargmann 2015-07-17 9:32 ` [PATCH 1/9] gpiolib: Fix possible use of wrong name Markus Pargmann 2015-07-17 9:32 ` Markus Pargmann 2015-07-28 9:03 ` Johan Hovold 2015-07-28 9:03 ` Johan Hovold 2015-07-29 6:46 ` Markus Pargmann 2015-07-29 6:46 ` Markus Pargmann 2015-07-17 9:32 ` [PATCH 2/9] gpiolib-of: Rename gpio_hog functions to be generic Markus Pargmann 2015-07-17 9:32 ` Markus Pargmann 2015-07-17 9:32 ` [PATCH 3/9] gpio: Allow hogged gpios to be requested Markus Pargmann 2015-07-17 9:32 ` Markus Pargmann 2015-07-17 20:27 ` Uwe Kleine-König 2015-07-17 20:27 ` Uwe Kleine-König 2015-07-19 14:01 ` Markus Pargmann 2015-07-19 14:01 ` Markus Pargmann 2015-07-20 6:32 ` Uwe Kleine-König 2015-07-20 6:32 ` Uwe Kleine-König 2015-07-20 7:51 ` Markus Pargmann 2015-07-20 7:51 ` Markus Pargmann 2015-07-28 9:17 ` Johan Hovold 2015-07-28 9:17 ` Johan Hovold 2015-07-29 6:52 ` Markus Pargmann 2015-07-29 6:52 ` Markus Pargmann 2015-08-10 9:20 ` Linus Walleij 2015-08-10 9:20 ` Linus Walleij 2015-07-17 9:32 ` [PATCH 4/9] gpio: Add 'name' to the gpio descriptor struct Markus Pargmann 2015-07-17 9:32 ` Markus Pargmann 2015-07-28 9:24 ` Johan Hovold 2015-07-28 9:24 ` Johan Hovold 2015-07-17 9:32 ` [PATCH 5/9] gpiolib: Implement gpio_name_to_desc() Markus Pargmann 2015-07-17 9:32 ` Markus Pargmann 2015-07-17 9:32 ` [PATCH 6/9] gpiolib-of: Reuse 'line-name' from DT as gpio descriptor name Markus Pargmann 2015-07-17 9:32 ` Markus Pargmann 2015-07-28 9:31 ` Johan Hovold 2015-07-28 9:31 ` Johan Hovold 2015-07-29 6:52 ` Markus Pargmann 2015-07-29 6:52 ` Markus Pargmann 2015-07-17 9:32 ` Markus Pargmann [this message] 2015-07-17 9:32 ` [PATCH 7/9] gpiolib-sysfs: Add gpio name parsing for sysfs export Markus Pargmann 2015-07-28 9:50 ` Johan Hovold 2015-07-28 9:50 ` Johan Hovold 2015-07-29 6:57 ` Markus Pargmann 2015-07-29 6:57 ` Markus Pargmann 2015-07-31 8:44 ` Johan Hovold 2015-07-31 8:44 ` Johan Hovold 2015-07-17 9:32 ` [PATCH 8/9] gpiolib-sysfs: Show gpio-name in /sys/class/gpio/gpio*/name Markus Pargmann 2015-07-17 9:32 ` Markus Pargmann 2015-07-28 9:53 ` Johan Hovold 2015-07-28 9:53 ` Johan Hovold 2015-07-29 7:02 ` Markus Pargmann 2015-07-29 7:02 ` Markus Pargmann 2015-07-17 9:32 ` [PATCH 9/9] gpiolib: Add gpio name information to /sys/kernel/debug/gpio Markus Pargmann 2015-07-17 9:32 ` Markus Pargmann 2015-07-28 9:58 ` Johan Hovold 2015-07-28 9:58 ` Johan Hovold 2015-07-29 7:08 ` Markus Pargmann 2015-07-29 7:08 ` Markus Pargmann 2015-07-31 8:54 ` Johan Hovold 2015-07-31 8:54 ` Johan Hovold 2015-07-31 10:41 ` Markus Pargmann 2015-07-31 10:41 ` Markus Pargmann 2015-07-31 10:45 ` Johan Hovold 2015-07-31 10:45 ` Johan Hovold 2015-07-31 10:49 ` Lucas Stach 2015-07-31 10:49 ` Lucas Stach 2015-07-17 20:05 ` [PATCH 0/9] gpiolib: Add GPIO name support Linus Walleij 2015-07-17 20:05 ` Linus Walleij 2015-07-21 9:00 ` Alexandre Courbot 2015-07-21 9:00 ` Alexandre Courbot 2015-07-21 9:54 ` Uwe Kleine-König 2015-07-21 9:54 ` Uwe Kleine-König 2015-07-21 10:10 ` Markus Pargmann 2015-07-21 10:10 ` Markus Pargmann [not found] ` <CAGmoSHt0Kg-cxe3U6uV40=ttmFbDruRcJZNxtmSZ=gmZQN5fTw@mail.gmail.com> 2015-07-31 9:49 ` Johan Hovold 2015-07-31 9:49 ` Johan Hovold 2015-07-31 10:42 ` Markus Pargmann 2015-07-31 10:42 ` Markus Pargmann 2015-07-28 14:16 ` Johan Hovold 2015-07-28 14:16 ` Johan Hovold 2015-07-29 9:23 ` Linus Walleij 2015-07-29 9:23 ` Linus Walleij 2015-07-31 9:40 ` Johan Hovold 2015-07-31 9:40 ` Johan Hovold
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=1437125570-28623-8-git-send-email-mpa@pengutronix.de \ --to=mpa@pengutronix.de \ --cc=gnurou@gmail.com \ --cc=kernel@pengutronix.de \ --cc=linus.walleij@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-gpio@vger.kernel.org \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.