summaryrefslogtreecommitdiff
path: root/drivers/gpio
diff options
context:
space:
mode:
authorSudip Mukherjee <sudipm.mukherjee@gmail.com>2015-12-27 13:36:50 (GMT)
committerLinus Walleij <linus.walleij@linaro.org>2015-12-27 22:51:21 (GMT)
commite28ecca6eac40646780b83edab81a496cea3d220 (patch)
tree424f60a57531739fbef2bcd9654784d2d6616a6c /drivers/gpio
parent60befd2ea1c2061775838ea7bac5cc2b1353afd0 (diff)
downloadlinux-e28ecca6eac40646780b83edab81a496cea3d220.tar.xz
gpio: fix warning about iterator
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> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpio')
-rw-r--r--drivers/gpio/gpiolib.c20
1 files changed, 12 insertions, 8 deletions
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 975a548..ca66302 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;
}