Re: linux-next: manual merge of the pinctrl-renesas tree with the pinctrl tree

[Geert Uytterhoeven]

Hi Stephen,

On Wed, 20 Aug 2025 at 05:02, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> After merging the pinctrl-renesas tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/pinctrl/renesas/pinctrl-rzt2h.c:161:14: error: assignment discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers]
>   161 |         func = pinmux_generic_get_function(pctldev, func_selector);
>       |              ^
>
> Caused by commit
>
>   90f2896d7dbb ("pinctrl: renesas: Add support for RZ/T2H")
>
> interacting with commit
>
>   afe1af86ff05 ("pinctrl: constify pinmux_generic_get_function()")
>
> from the pinctrl tree.

Thanks for your report!

> I have applied the following merge fix patch.
>
> From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> Date: Wed, 20 Aug 2025 12:42:30 +1000
> Subject: [PATCH] fix up for "pinctrl: renesas: Add support for RZ/T2H"
>
> interacting with commit
>
>   afe1af86ff05 ("pinctrl: constify pinmux_generic_get_function()")
>
> from the pinctrl tree.
>
> Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>

> --- a/drivers/pinctrl/renesas/pinctrl-rzt2h.c
> +++ b/drivers/pinctrl/renesas/pinctrl-rzt2h.c
> @@ -151,7 +151,7 @@ static int rzt2h_pinctrl_set_mux(struct pinctrl_dev *pctldev,
>                                  unsigned int group_selector)
>  {
>         struct rzt2h_pinctrl *pctrl = pinctrl_dev_get_drvdata(pctldev);
> -       struct function_desc *func;
> +       const struct function_desc *func;
>         struct group_desc *group;
>         const unsigned int *pins;
>         unsigned int i;

I will fold this fix into commit 90f2896d7dbb ("pinctrl: renesas:
Add support for RZ/T2H"), as it does not depend on commit afe1af86ff05
("pinctrl: constify pinmux_generic_get_function()").

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds