Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <20230616145036.3910153-1-arnd@kernel.org>
In-Reply-To: <20230616145036.3910153-1-arnd@kernel.org>
From:   Bartosz Golaszewski <brgl@bgdev.pl>
Date:   Mon, 19 Jun 2023 14:50:46 +0200
Message-ID: <CAMRc=MfVtNgRPHcceSW-ZsTuUmvGWw2tr4qD6YzwtoYO+KDvGA@mail.gmail.com>
Subject: Re: [PATCH] gpio: synq: remove unused zynq_gpio_irq_reqres/zynq_gpio_irq_relres
To:     Arnd Bergmann <arnd@kernel.org>
Cc:     Shubhrajyoti Datta <shubhrajyoti.datta@amd.com>,
        Linus Walleij <linus.walleij@linaro.org>,
        Michal Simek <michal.simek@amd.com>,
        Manikanta Guntupalli <manikanta.guntupalli@amd.com>,
        Arnd Bergmann <arnd@arndb.de>,
        Srinivas Neeli <srinivas.neeli@amd.com>,
        Andy Shevchenko <andy@kernel.org>, linux-gpio@vger.kernel.org,
        linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Fri, Jun 16, 2023 at 4:50=E2=80=AFPM Arnd Bergmann <arnd@kernel.org> wro=
te:
>
> From: Arnd Bergmann <arnd@arndb.de>
>
> The driver now uses the generic request/release callbacks, so the custom
> ones are no longer called. When building with -Woverride-init, gcc produc=
es
> a warning about the duplicate entries:
>
> In file included from drivers/gpio/gpio-zynq.c:10:
> include/linux/gpio/driver.h:621:43: error: initialized field overwritten =
[-Werror=3Doverride-init]
>   621 |                 .irq_request_resources  =3D gpiochip_irq_reqres, =
         \
>       |                                           ^~~~~~~~~~~~~~~~~~~
> drivers/gpio/gpio-zynq.c:611:9: note: in expansion of macro 'GPIOCHIP_IRQ=
_RESOURCE_HELPERS'
>   611 |         GPIOCHIP_IRQ_RESOURCE_HELPERS,
>       |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> include/linux/gpio/driver.h:621:43: note: (near initialization for 'zynq_=
gpio_level_irqchip.irq_request_resources')
>   621 |                 .irq_request_resources  =3D gpiochip_irq_reqres, =
         \
>       |                                           ^~~~~~~~~~~~~~~~~~~
> drivers/gpio/gpio-zynq.c:625:9: note: in expansion of macro 'GPIOCHIP_IRQ=
_RESOURCE_HELPERS'
>   625 |         GPIOCHIP_IRQ_RESOURCE_HELPERS,
>       |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> include/linux/gpio/driver.h:622:43: error: initialized field overwritten =
[-Werror=3Doverride-init]
>   622 |                 .irq_release_resources  =3D gpiochip_irq_relres
>       |                                           ^~~~~~~~~~~~~~~~~~~
>
> Removing the old ones has no effect on the driver but avoids the warnings=
.
>
> Fixes: f569143935378 ("gpio: zynq: fix zynqmp_gpio not an immutable chip =
warning")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
>  drivers/gpio/gpio-zynq.c | 24 ------------------------
>  1 file changed, 24 deletions(-)
>
> diff --git a/drivers/gpio/gpio-zynq.c b/drivers/gpio/gpio-zynq.c
> index c334e46033bae..0a7264aabe488 100644
> --- a/drivers/gpio/gpio-zynq.c
> +++ b/drivers/gpio/gpio-zynq.c
> @@ -575,26 +575,6 @@ static int zynq_gpio_set_wake(struct irq_data *data,=
 unsigned int on)
>         return 0;
>  }
>
> -static int zynq_gpio_irq_reqres(struct irq_data *d)
> -{
> -       struct gpio_chip *chip =3D irq_data_get_irq_chip_data(d);
> -       int ret;
> -
> -       ret =3D pm_runtime_resume_and_get(chip->parent);
> -       if (ret < 0)
> -               return ret;
> -
> -       return gpiochip_reqres_irq(chip, d->hwirq);
> -}
> -
> -static void zynq_gpio_irq_relres(struct irq_data *d)
> -{
> -       struct gpio_chip *chip =3D irq_data_get_irq_chip_data(d);
> -
> -       gpiochip_relres_irq(chip, d->hwirq);
> -       pm_runtime_put(chip->parent);
> -}
> -
>  /* irq chip descriptor */
>  static const struct irq_chip zynq_gpio_level_irqchip =3D {
>         .name           =3D DRIVER_NAME,
> @@ -604,8 +584,6 @@ static const struct irq_chip zynq_gpio_level_irqchip =
=3D {
>         .irq_unmask     =3D zynq_gpio_irq_unmask,
>         .irq_set_type   =3D zynq_gpio_set_irq_type,
>         .irq_set_wake   =3D zynq_gpio_set_wake,
> -       .irq_request_resources =3D zynq_gpio_irq_reqres,
> -       .irq_release_resources =3D zynq_gpio_irq_relres,
>         .flags          =3D IRQCHIP_EOI_THREADED | IRQCHIP_EOI_IF_HANDLED=
 |
>                           IRQCHIP_MASK_ON_SUSPEND | IRQCHIP_IMMUTABLE,
>         GPIOCHIP_IRQ_RESOURCE_HELPERS,
> @@ -619,8 +597,6 @@ static const struct irq_chip zynq_gpio_edge_irqchip =
=3D {
>         .irq_unmask     =3D zynq_gpio_irq_unmask,
>         .irq_set_type   =3D zynq_gpio_set_irq_type,
>         .irq_set_wake   =3D zynq_gpio_set_wake,
> -       .irq_request_resources =3D zynq_gpio_irq_reqres,
> -       .irq_release_resources =3D zynq_gpio_irq_relres,
>         .flags          =3D IRQCHIP_MASK_ON_SUSPEND | IRQCHIP_IMMUTABLE,
>         GPIOCHIP_IRQ_RESOURCE_HELPERS,
>  };
> --
> 2.39.2
>

Applied, thanks!

Bart