From: Conor Dooley <conor.dooley@microchip.com>

The signature of extract pinctrl_generic_to_map() is incorrect when
CONFIG_GENERIC_PINCTRL and CONFIG_OF are not enabled. Probably a
hangover from an earlier revision of the patchset that was not updated
that went undetected given it depends on OF being disabled.

Fixes: aaaf31be04260 ("pinctrl: extract pinctrl_generic_to_map() from pinctrl_generic_pins_function_dt_node_to_map()")
Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
---
CC: Linus Walleij <linusw@kernel.org>
CC: Frank Li <Frank.Li@nxp.com>
CC: Conor Dooley <conor.dooley@microchip.com>
CC: linux-gpio@vger.kernel.org
CC: linux-kernel@vger.kernel.org
---
 drivers/pinctrl/pinconf.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/pinctrl/pinconf.h b/drivers/pinctrl/pinconf.h
index fa8fb0d290d1d..9711d16c38b62 100644
--- a/drivers/pinctrl/pinconf.h
+++ b/drivers/pinctrl/pinconf.h
@@ -195,7 +195,7 @@ pinctrl_generic_to_map(struct pinctrl_dev *pctldev, struct device_node *parent,
 		       unsigned int *num_maps, unsigned int *num_reserved_maps,
 		       const char **group_name, unsigned int ngroups,
 		       const char **functions, unsigned int *pins,
-		       void *function_data)
+		       unsigned int npins)
 {
 	return -ENOTSUPP;
 }
-- 
2.53.0

On Thu, May 14, 2026 at 09:01:27PM +0100, Conor Dooley wrote:
> From: Conor Dooley <conor.dooley@microchip.com>
>
> The signature of extract pinctrl_generic_to_map() is incorrect when
> CONFIG_GENERIC_PINCTRL and CONFIG_OF are not enabled. Probably a
> hangover from an earlier revision of the patchset that was not updated
> that went undetected given it depends on OF being disabled.

Thanks, I already posted fix patch at

https://lore.kernel.org/imx/20260512144806.22447-1-Frank.Li@nxp.com/T/#u

Frank

>
> Fixes: aaaf31be04260 ("pinctrl: extract pinctrl_generic_to_map() from pinctrl_generic_pins_function_dt_node_to_map()")
> Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
> ---
> CC: Linus Walleij <linusw@kernel.org>
> CC: Frank Li <Frank.Li@nxp.com>
> CC: Conor Dooley <conor.dooley@microchip.com>
> CC: linux-gpio@vger.kernel.org
> CC: linux-kernel@vger.kernel.org
> ---
>  drivers/pinctrl/pinconf.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/pinctrl/pinconf.h b/drivers/pinctrl/pinconf.h
> index fa8fb0d290d1d..9711d16c38b62 100644
> --- a/drivers/pinctrl/pinconf.h
> +++ b/drivers/pinctrl/pinconf.h
> @@ -195,7 +195,7 @@ pinctrl_generic_to_map(struct pinctrl_dev *pctldev, struct device_node *parent,
>  		       unsigned int *num_maps, unsigned int *num_reserved_maps,
>  		       const char **group_name, unsigned int ngroups,
>  		       const char **functions, unsigned int *pins,
> -		       void *function_data)
> +		       unsigned int npins)
>  {
>  	return -ENOTSUPP;
>  }
> --
> 2.53.0
>

On Thu, May 14, 2026 at 05:08:16PM -0400, Frank Li wrote:
> On Thu, May 14, 2026 at 09:01:27PM +0100, Conor Dooley wrote:
> > From: Conor Dooley <conor.dooley@microchip.com>
> >
> > The signature of extract pinctrl_generic_to_map() is incorrect when
> > CONFIG_GENERIC_PINCTRL and CONFIG_OF are not enabled. Probably a
> > hangover from an earlier revision of the patchset that was not updated
> > that went undetected given it depends on OF being disabled.
> 
> Thanks, I already posted fix patch at
> 
> https://lore.kernel.org/imx/20260512144806.22447-1-Frank.Li@nxp.com/T/#u
> 

Oh, I didn't realise that was a fix for this because the subject is
has nothing to do with the problem. That looks like it should be two
patches.

Thanks,
Conor.

> Frank
> 
> >
> > Fixes: aaaf31be04260 ("pinctrl: extract pinctrl_generic_to_map() from pinctrl_generic_pins_function_dt_node_to_map()")
> > Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
> > ---
> > CC: Linus Walleij <linusw@kernel.org>
> > CC: Frank Li <Frank.Li@nxp.com>
> > CC: Conor Dooley <conor.dooley@microchip.com>
> > CC: linux-gpio@vger.kernel.org
> > CC: linux-kernel@vger.kernel.org
> > ---
> >  drivers/pinctrl/pinconf.h | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/pinctrl/pinconf.h b/drivers/pinctrl/pinconf.h
> > index fa8fb0d290d1d..9711d16c38b62 100644
> > --- a/drivers/pinctrl/pinconf.h
> > +++ b/drivers/pinctrl/pinconf.h
> > @@ -195,7 +195,7 @@ pinctrl_generic_to_map(struct pinctrl_dev *pctldev, struct device_node *parent,
> >  		       unsigned int *num_maps, unsigned int *num_reserved_maps,
> >  		       const char **group_name, unsigned int ngroups,
> >  		       const char **functions, unsigned int *pins,
> > -		       void *function_data)
> > +		       unsigned int npins)
> >  {
> >  	return -ENOTSUPP;
> >  }
> > --
> > 2.53.0
> >