[RFC v1 1/4] pinctrl: generic: change signature of pinctrl_generic_to_map() to pass void data
Conor Dooley
conor at kernel.org
Wed May 6 02:57:39 PDT 2026
From: Conor Dooley <conor.dooley at microchip.com>
Signed-off-by: Conor Dooley <conor.dooley at microchip.com>
---
drivers/pinctrl/pinconf.h | 6 ++----
drivers/pinctrl/pinctrl-generic.c | 5 ++---
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/drivers/pinctrl/pinconf.h b/drivers/pinctrl/pinconf.h
index 83f2d00c732e1..5d99fef27657f 100644
--- a/drivers/pinctrl/pinconf.h
+++ b/drivers/pinctrl/pinconf.h
@@ -171,8 +171,7 @@ int pinctrl_generic_to_map(struct pinctrl_dev *pctldev, struct device_node *pare
struct device_node *np, struct pinctrl_map **maps,
unsigned int *num_maps, unsigned int *num_reserved_maps,
const char **group_name, unsigned int ngroups,
- const char **functions, unsigned int *pins,
- unsigned int npins);
+ void *data, unsigned int *pins, unsigned int npins);
#else
static inline int
pinctrl_generic_pins_function_dt_node_to_map(struct pinctrl_dev *pctldev,
@@ -188,8 +187,7 @@ pinctrl_generic_to_map(struct pinctrl_dev *pctldev, struct device_node *parent,
struct device_node *np, struct pinctrl_map **maps,
unsigned int *num_maps, unsigned int *num_reserved_maps,
const char **group_name, unsigned int ngroups,
- const char **functions, unsigned int *pins,
- unsigned int npins)
+ void *data, unsigned int *pins, unsigned int npins)
{
return -ENOTSUPP;
}
diff --git a/drivers/pinctrl/pinctrl-generic.c b/drivers/pinctrl/pinctrl-generic.c
index 76670aef62da4..6a13fd4eea65b 100644
--- a/drivers/pinctrl/pinctrl-generic.c
+++ b/drivers/pinctrl/pinctrl-generic.c
@@ -21,8 +21,7 @@ int pinctrl_generic_to_map(struct pinctrl_dev *pctldev, struct device_node *pare
struct device_node *np, struct pinctrl_map **maps,
unsigned int *num_maps, unsigned int *num_reserved_maps,
const char **group_names, unsigned int ngroups,
- const char **functions, unsigned int *pins,
- unsigned int npins)
+ void *data, unsigned int *pins, unsigned int npins)
{
struct device *dev = pctldev->dev;
unsigned int num_configs;
@@ -45,7 +44,7 @@ int pinctrl_generic_to_map(struct pinctrl_dev *pctldev, struct device_node *pare
if (ret < 0)
return ret;
- ret = pinctrl_generic_add_group(pctldev, group_name, pins, npins, functions);
+ ret = pinctrl_generic_add_group(pctldev, group_name, pins, npins, data);
if (ret < 0)
return dev_err_probe(dev, ret, "failed to add group %s: %d\n",
group_name, ret);
--
2.53.0
More information about the linux-riscv
mailing list