Re: [PATCH] gpio: uniphier: merge fix for "Update irq_domain_ops.activate() signature"

[Linus Walleij <linus.walleij@xxxxxxxxxx>]

Masahiro,

can you check that this ended up all right in the merge window,
else send a fixup patch?

Sorry for the mess.

Yours,
Linus Walleij


On Mon, Nov 13, 2017 at 2:36 PM, Masahiro Yamada
<yamada.masahiro@xxxxxxxxxxxxx> wrote:
> From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
>
> Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> ---
>
> Changes since Stephens's original post
>   - Fix checkpatch.pl warning
>     "CHECK: Alignment should match open parenthesis"
>   - Stretch lines since it fits in 80-columns
>
>
>  drivers/gpio/gpio-uniphier.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpio/gpio-uniphier.c b/drivers/gpio/gpio-uniphier.c
> index d62cea4..71b768e 100644
> --- a/drivers/gpio/gpio-uniphier.c
> +++ b/drivers/gpio/gpio-uniphier.c
> @@ -300,13 +300,15 @@ static int uniphier_gpio_irq_domain_alloc(struct irq_domain *domain,
>         return irq_domain_alloc_irqs_parent(domain, virq, 1, &parent_fwspec);
>  }
>
> -static void uniphier_gpio_irq_domain_activate(struct irq_domain *domain,
> -                                             struct irq_data *data)
> +static int uniphier_gpio_irq_domain_activate(struct irq_domain *domain,
> +                                            struct irq_data *data, bool early)
>  {
>         struct uniphier_gpio_priv *priv = domain->host_data;
>         struct gpio_chip *chip = &priv->chip;
>
>         gpiochip_lock_as_irq(chip, data->hwirq + UNIPHIER_GPIO_IRQ_OFFSET);
> +
> +       return 0;
>  }
>
>  static void uniphier_gpio_irq_domain_deactivate(struct irq_domain *domain,
> --
> 2.7.4
>
--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html