2012-11-06 15:17:10

by Linus Walleij

Subject: [PATCH 3/5] gpiolib: remove duplicate pin range code

From: Linus Walleij <[email protected]>

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 <[email protected]>
---
drivers/gpio/gpiolib-of.c | 13 +------------
1 file changed, 1 insertion(+), 12 deletions(-)

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);
--
1.7.11.3

2012-11-07 05:14:21

by Viresh Kumar

Subject: Re: [PATCH 3/5] gpiolib: remove duplicate pin range code

On Tue, Nov 6, 2012 at 8:46 PM, Linus Walleij
<[email protected]> wrote:
> From: Linus Walleij <[email protected]>
>
> 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 <[email protected]>

I can't believe that i did this :(

Reviewed-by: Viresh Kumar <[email protected]>

2012-11-08 12:54:41

by Linus Walleij

Subject: Re: [PATCH 3/5] gpiolib: remove duplicate pin range code

On Wed, Nov 7, 2012 at 6:14 AM, viresh kumar <[email protected]> wrote:
> On Tue, Nov 6, 2012 at 8:46 PM, Linus Walleij
> <[email protected]> wrote:
>> From: Linus Walleij <[email protected]>
>>
>> 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 <[email protected]>
>
> 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