From: Bartosz Golaszewski <brgl@bgdev.pl>
To: Kent Gibson <warthog618@gmail.com>,
Linus Walleij <linus.walleij@linaro.org>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org,
Bartosz Golaszewski <bgolaszewski@baylibre.com>,
Andy Shevchenko <andy.shevchenko@gmail.com>
Subject: [PATCH v3 06/13] gpiolib: use gpiochip_get_desc() in gpio_ioctl()
Date: Thu, 19 Dec 2019 18:15:21 +0100 [thread overview]
Message-ID: <20191219171528.6348-7-brgl@bgdev.pl> (raw)
In-Reply-To: <20191219171528.6348-1-brgl@bgdev.pl>
From: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Unduplicate the offset check by simply calling gpiochip_get_desc() and
checking its return value.
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
---
drivers/gpio/gpiolib.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 17796437d7be..b7043946c029 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -1175,10 +1175,11 @@ static long gpio_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
if (copy_from_user(&lineinfo, ip, sizeof(lineinfo)))
return -EFAULT;
- if (lineinfo.line_offset >= gdev->ngpio)
- return -EINVAL;
- desc = &gdev->descs[lineinfo.line_offset];
+ desc = gpiochip_get_desc(chip, lineinfo.line_offset);
+ if (IS_ERR(desc))
+ return PTR_ERR(desc);
+
if (desc->name) {
strncpy(lineinfo.name, desc->name,
sizeof(lineinfo.name));
--
2.23.0
next prev parent reply other threads:[~2019-12-19 17:15 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-19 17:15 [PATCH v3 00/13] gpiolib: add an ioctl() for monitoring line status changes Bartosz Golaszewski
2019-12-19 17:15 ` [PATCH v3 01/13] gpiolib: use 'unsigned int' instead of 'unsigned' in gpio_set_config() Bartosz Golaszewski
2019-12-19 17:15 ` [PATCH v3 02/13] gpiolib: have a single place of calling set_config() Bartosz Golaszewski
2019-12-19 17:15 ` [PATCH v3 03/13] gpiolib: convert the type of hwnum to unsigned int in gpiochip_get_desc() Bartosz Golaszewski
2019-12-19 17:15 ` [PATCH v3 04/13] gpiolib: use gpiochip_get_desc() in linehandle_create() Bartosz Golaszewski
2019-12-19 17:15 ` [PATCH v3 05/13] gpiolib: use gpiochip_get_desc() in lineevent_create() Bartosz Golaszewski
2019-12-19 17:15 ` Bartosz Golaszewski [this message]
2019-12-19 17:15 ` [PATCH v3 07/13] kfifo: provide noirqsave variants of spinlocked in and out helpers Bartosz Golaszewski
2019-12-19 17:15 ` [PATCH v3 08/13] kfifo: provide kfifo_is_empty_spinlocked() Bartosz Golaszewski
2019-12-19 17:15 ` [PATCH v3 09/13] gpiolib: rework the locking mechanism for lineevent kfifo Bartosz Golaszewski
2019-12-19 17:15 ` [PATCH v3 10/13] gpiolib: emit a debug message when adding events to a full kfifo Bartosz Golaszewski
2019-12-19 17:15 ` [PATCH v3 11/13] gpiolib: provide a dedicated function for setting lineinfo Bartosz Golaszewski
2019-12-19 17:15 ` [PATCH v3 12/13] gpiolib: add new ioctl() for monitoring changes in line info Bartosz Golaszewski
2019-12-19 17:24 ` Greg Kroah-Hartman
2019-12-20 8:45 ` Bartosz Golaszewski
2019-12-19 18:17 ` Andy Shevchenko
2019-12-20 11:25 ` Bartosz Golaszewski
2019-12-20 12:15 ` Andy Shevchenko
2019-12-20 17:29 ` Bartosz Golaszewski
2019-12-24 12:09 ` Bartosz Golaszewski
2019-12-24 12:08 ` Bartosz Golaszewski
2019-12-19 17:15 ` [PATCH v3 13/13] tools: gpio: implement gpio-watch Bartosz Golaszewski
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=20191219171528.6348-7-brgl@bgdev.pl \
--to=brgl@bgdev.pl \
--cc=andriy.shevchenko@linux.intel.com \
--cc=andy.shevchenko@gmail.com \
--cc=bgolaszewski@baylibre.com \
--cc=gregkh@linuxfoundation.org \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=warthog618@gmail.com \
/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;
as well as URLs for NNTP newsgroup(s).