openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

gpio: gpio-xz: use the generic request/free implementations 

Instead of storing in the chip data whether the chip uses pinctrl and
conditionally call pinctrl_{request,free}_gpio, just don't populate
request/free in that case.

This makes the implementations trivial and the same as the generic
implementations, thus we can just use them.

Signed-off-by: Jonas Gorski <jogo@openwrt.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Jonas Gorski 2015-10-11 17:34:17 +02:00 committed by Linus Walleij
parent 203f0daafd
commit da4002ee90
1 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/gpio/gpio-zx.c
View File

@ -41,7 +41,6 @@ struct zx_gpio {
void __iomem *base; void __iomem *base;
struct gpio_chip gc; struct gpio_chip gc;
bool uses_pinctrl;
}; };
static inline struct zx_gpio *to_zx(struct gpio_chip *gc) static inline struct zx_gpio *to_zx(struct gpio_chip *gc)
@ -49,25 +48,6 @@ static inline struct zx_gpio *to_zx(struct gpio_chip *gc)
return container_of(gc, struct zx_gpio, gc); return container_of(gc, struct zx_gpio, gc);
} }
static int zx_gpio_request(struct gpio_chip *gc, unsigned offset)
{
struct zx_gpio *chip = to_zx(gc);
int gpio = gc->base + offset;
if (chip->uses_pinctrl)
return pinctrl_request_gpio(gpio);
return 0;
}
static void zx_gpio_free(struct gpio_chip *gc, unsigned offset)
{
struct zx_gpio *chip = to_zx(gc);
int gpio = gc->base + offset;
if (chip->uses_pinctrl)
pinctrl_free_gpio(gpio);
}
static int zx_direction_input(struct gpio_chip *gc, unsigned offset) static int zx_direction_input(struct gpio_chip *gc, unsigned offset)
{ {
struct zx_gpio *chip = to_zx(gc); struct zx_gpio *chip = to_zx(gc);
@ -252,12 +232,12 @@ static int zx_gpio_probe(struct platform_device *pdev)
return PTR_ERR(chip->base); return PTR_ERR(chip->base);
spin_lock_init(&chip->lock); spin_lock_init(&chip->lock);
if (of_property_read_bool(dev->of_node, "gpio-ranges")) if (of_property_read_bool(dev->of_node, "gpio-ranges")) {
chip->uses_pinctrl = true; chip->gc.request = gpiochip_generic_request;
chip->gc.free = gpiochip_generic_free;
}
id = of_alias_get_id(dev->of_node, "gpio"); id = of_alias_get_id(dev->of_node, "gpio");
chip->gc.request = zx_gpio_request;
chip->gc.free = zx_gpio_free;
chip->gc.direction_input = zx_direction_input; chip->gc.direction_input = zx_direction_input;
chip->gc.direction_output = zx_direction_output; chip->gc.direction_output = zx_direction_output;
chip->gc.get = zx_get_value; chip->gc.get = zx_get_value;