| Message ID | 1352215014-30305-1-git-send-email-linus.walleij@stericsson.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Nov 6, 2012 at 8:46 PM, Linus Walleij <linus.walleij@stericsson.com> wrote: > From: Linus Walleij <linus.walleij@linaro.org> > > Commit 69e1601bca88809dc118abd1becb02c15a02ec71 > "gpiolib: provide provision to register pin ranges" > > Introduced both of_gpiochip_remove_pin_range() and > gpiochip_remove_pin_ranges(). But the contents are exactly > the same so remove the OF one and rely on the range deletion > in the core. > > Signed-off-by: Linus Walleij <linus.walleij@linaro.org> I can't believe that i did this :( Reviewed-by: Viresh Kumar <viresh.kumar@linaro.org>
On Wed, Nov 7, 2012 at 6:14 AM, viresh kumar <viresh.kumar@linaro.org> wrote: > On Tue, Nov 6, 2012 at 8:46 PM, Linus Walleij > <linus.walleij@stericsson.com> wrote: >> From: Linus Walleij <linus.walleij@linaro.org> >> >> Commit 69e1601bca88809dc118abd1becb02c15a02ec71 >> "gpiolib: provide provision to register pin ranges" >> >> Introduced both of_gpiochip_remove_pin_range() and >> gpiochip_remove_pin_ranges(). But the contents are exactly >> the same so remove the OF one and rely on the range deletion >> in the core. >> >> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> > > I can't believe that i did this :( Don't worry, it's impossible to get these things right. I am trying to fix it properly here and just introduce new bugs for every fix I try to make. Maybe I'll soon have something that actually doesn't break x86... Yours, Linus Walleij
diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c index 220caa5..67403e4 100644 --- a/drivers/gpio/gpiolib-of.c +++ b/drivers/gpio/gpiolib-of.c @@ -254,19 +254,8 @@ static void of_gpiochip_add_pin_range(struct gpio_chip *chip) } while (index++); } -static void of_gpiochip_remove_pin_range(struct gpio_chip *chip) -{ - struct gpio_pin_range *pin_range, *tmp; - - list_for_each_entry_safe(pin_range, tmp, &chip->pin_ranges, node) { - list_del(&pin_range->node); - pinctrl_remove_gpio_range(pin_range->pctldev, - &pin_range->range); - } -} #else static void of_gpiochip_add_pin_range(struct gpio_chip *chip) {} -static void of_gpiochip_remove_pin_range(struct gpio_chip *chip) {} #endif void of_gpiochip_add(struct gpio_chip *chip) @@ -288,7 +277,7 @@ void of_gpiochip_add(struct gpio_chip *chip) void of_gpiochip_remove(struct gpio_chip *chip) { - of_gpiochip_remove_pin_range(chip); + gpiochip_remove_pin_ranges(chip); if (chip->of_node) of_node_put(chip->of_node);