From: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
To: Linus Walleij <linus.walleij@linaro.org>,
Alexandre Courbot <gnurou@gmail.com>
Cc: linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Subject: [PATCH v2] gpiolib: fix warning about iterator
Date: Sun, 27 Dec 2015 19:06:50 +0530 [thread overview]
Message-ID: <1451223410-8985-1-git-send-email-sudipm.mukherjee@gmail.com> (raw)
In-Reply-To: <CACRpkdZA7m=YzjVmQwzoKNzMu+QiOeA9s3Wu_axZYMw=5j-LnQ@mail.gmail.com>
We were getting build warning about "iterator" being used uninitialized.
Use iterator properly to fix the build warning and in the process remove
the variable "pos" which is not required now.
Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
---
v1: at the end of the loop iterator will point to head and we are trying
to check its field.
drivers/gpio/gpiolib.c | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index d72ac1f..6972b4e 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -189,23 +189,21 @@ EXPORT_SYMBOL_GPL(gpiod_get_direction);
*/
static int gpiochip_add_to_list(struct gpio_chip *chip)
{
- struct list_head *pos;
struct gpio_chip *iterator;
struct gpio_chip *previous = NULL;
if (list_empty(&gpio_chips)) {
- pos = gpio_chips.next;
- goto found;
+ list_add_tail(&chip->list, &gpio_chips);
+ return 0;
}
- list_for_each(pos, &gpio_chips) {
- iterator = list_entry(pos, struct gpio_chip, list);
+ list_for_each_entry(iterator, &gpio_chips, list) {
if (iterator->base >= chip->base + chip->ngpio) {
/*
* Iterator is the first GPIO chip so there is no
* previous one
*/
- if (previous == NULL) {
+ if (!previous) {
goto found;
} else {
/*
@@ -221,7 +219,13 @@ static int gpiochip_add_to_list(struct gpio_chip *chip)
previous = iterator;
}
- /* We are beyond the last chip in the list */
+ /*
+ * We are beyond the last chip in the list and iterator now
+ * points to the head.
+ * Let iterator point to the last chip in the list.
+ */
+
+ iterator = list_last_entry(&gpio_chips, struct gpio_chip, list);
if (iterator->base + iterator->ngpio <= chip->base)
goto found;
@@ -230,7 +234,7 @@ static int gpiochip_add_to_list(struct gpio_chip *chip)
return -EBUSY;
found:
- list_add_tail(&chip->list, pos);
+ list_add_tail(&chip->list, &iterator->list);
return 0;
}
--
1.9.1
next prev parent reply other threads:[~2015-12-27 13:36 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-26 7:58 [PATCH] gpiolib: fix warning about iterator Sudip Mukherjee
2015-12-26 21:31 ` Linus Walleij
2015-12-27 13:31 ` Sudip Mukherjee
2015-12-27 13:36 ` Sudip Mukherjee [this message]
2015-12-28 0:35 ` [PATCH v2] " Linus Walleij
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=1451223410-8985-1-git-send-email-sudipm.mukherjee@gmail.com \
--to=sudipm.mukherjee@gmail.com \
--cc=gnurou@gmail.com \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@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: 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).