Jonas Gorski <jogo@xxxxxxxxxxx> writes:
> diff --git a/drivers/pinctrl/bcm/pinctrl-bcm2835.c b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
> index 8efa235..a1ea565 100644
> --- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c
> +++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
> @@ -330,16 +330,6 @@ static inline void bcm2835_pinctrl_fsel_set(
> bcm2835_gpio_wr(pc, FSEL_REG(pin), val);
> }
>
> -static int bcm2835_gpio_request(struct gpio_chip *chip, unsigned offset)
> -{
> - return pinctrl_request_gpio(chip->base + offset);
> -}
> -
> -static void bcm2835_gpio_free(struct gpio_chip *chip, unsigned offset)
> -{
> - pinctrl_free_gpio(chip->base + offset);
> -}
> -
> static int bcm2835_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
> {
> return pinctrl_gpio_direction_input(chip->base + offset);
> @@ -375,8 +365,8 @@ static int bcm2835_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
> static struct gpio_chip bcm2835_gpio_chip = {
> .label = MODULE_NAME,
> .owner = THIS_MODULE,
> - .request = bcm2835_gpio_request,
> - .free = bcm2835_gpio_free,
> + .request = gpiochip_generic_request,
> + .free = gpiochip_generic_free,
> .direction_input = bcm2835_gpio_direction_input,
> .direction_output = bcm2835_gpio_direction_output,
> .get = bcm2835_gpio_get,
For the bcm2835 part,
Acked-by: Eric Anholt <eric@xxxxxxxxxx>
Attachment:
signature.asc
Description: PGP signature
