Skip to content

Commit

Permalink
gpiolib: remove duplicate pin range code
Browse files Browse the repository at this point in the history
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.

Reviewed-by: Stephen Warren <swarren@nvidia.com>
Reviewed-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
  • Loading branch information
Linus Walleij committed Nov 11, 2012
1 parent 167c1af commit e93fa3f
Showing 1 changed file with 1 addition and 12 deletions.
13 changes: 1 addition & 12 deletions drivers/gpio/gpiolib-of.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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);
Expand Down

0 comments on commit e93fa3f

Please sign in to comment.