| Message ID | 81e9ab48f78d63153b23a163b3349b3059d2b7fc.1692871558.git.geert+renesas@glider.be |
|---|---|
| State | New |
| Headers | show |
| Series | pinctrl: nuvoton: Use pinconf_generic_dt_node_to_map_all() | expand |
On Thu, Aug 24, 2023 at 12:07:44PM +0200, Geert Uytterhoeven wrote: > Use the pinconf_generic_dt_node_to_map_all() helper instead of > open-coding the same operation, to avoid having to provide custom > pinctrl_ops.dt_node_to_map() callbacks. > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > --- > This does sacrifice a debug print in the process. Does anyone care? > --- > drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 15 +-------------- > drivers/pinctrl/nuvoton/pinctrl-wpcm450.c | 12 +----------- > 2 files changed, 2 insertions(+), 25 deletions(-) > > diff --git a/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c b/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c > index 843ffcd968774774..8bdd0124e2eb9467 100644 > --- a/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c > +++ b/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c > @@ -1588,19 +1588,6 @@ static int npcm7xx_get_group_pins(struct pinctrl_dev *pctldev, > return 0; > } > > -static int npcm7xx_dt_node_to_map(struct pinctrl_dev *pctldev, > - struct device_node *np_config, > - struct pinctrl_map **map, > - u32 *num_maps) > -{ > - struct npcm7xx_pinctrl *npcm = pinctrl_dev_get_drvdata(pctldev); > - > - dev_dbg(npcm->dev, "dt_node_to_map: %s\n", np_config->name); > - return pinconf_generic_dt_node_to_map(pctldev, np_config, > - map, num_maps, > - PIN_MAP_TYPE_INVALID); > -} > - > static void npcm7xx_dt_free_map(struct pinctrl_dev *pctldev, > struct pinctrl_map *map, u32 num_maps) > { > @@ -1612,7 +1599,7 @@ static const struct pinctrl_ops npcm7xx_pinctrl_ops = { > .get_group_name = npcm7xx_get_group_name, > .get_group_pins = npcm7xx_get_group_pins, > .pin_dbg_show = npcm7xx_pin_dbg_show, > - .dt_node_to_map = npcm7xx_dt_node_to_map, > + .dt_node_to_map = pinconf_generic_dt_node_to_map_all, > .dt_free_map = npcm7xx_dt_free_map, > }; > > diff --git a/drivers/pinctrl/nuvoton/pinctrl-wpcm450.c b/drivers/pinctrl/nuvoton/pinctrl-wpcm450.c > index 2d1c1652cfd9d373..6e88ef1ed020fa88 100644 > --- a/drivers/pinctrl/nuvoton/pinctrl-wpcm450.c > +++ b/drivers/pinctrl/nuvoton/pinctrl-wpcm450.c > @@ -858,16 +858,6 @@ static int wpcm450_get_group_pins(struct pinctrl_dev *pctldev, > return 0; > } > > -static int wpcm450_dt_node_to_map(struct pinctrl_dev *pctldev, > - struct device_node *np_config, > - struct pinctrl_map **map, > - u32 *num_maps) > -{ > - return pinconf_generic_dt_node_to_map(pctldev, np_config, > - map, num_maps, > - PIN_MAP_TYPE_INVALID); > -} > - > static void wpcm450_dt_free_map(struct pinctrl_dev *pctldev, > struct pinctrl_map *map, u32 num_maps) > { > @@ -878,7 +868,7 @@ static const struct pinctrl_ops wpcm450_pinctrl_ops = { > .get_groups_count = wpcm450_get_groups_count, > .get_group_name = wpcm450_get_group_name, > .get_group_pins = wpcm450_get_group_pins, > - .dt_node_to_map = wpcm450_dt_node_to_map, > + .dt_node_to_map = pinconf_generic_dt_node_to_map_all, > .dt_free_map = wpcm450_dt_free_map, Reviewed-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net> Thanks!
On Thu, Aug 24, 2023 at 12:07 PM Geert Uytterhoeven <geert+renesas@glider.be> wrote: > Use the pinconf_generic_dt_node_to_map_all() helper instead of > open-coding the same operation, to avoid having to provide custom > pinctrl_ops.dt_node_to_map() callbacks. > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Patch applied, I hope this doesn't disturb Tomers ongoing work too much. Yours, Linus Walleij
diff --git a/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c b/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c index 843ffcd968774774..8bdd0124e2eb9467 100644 --- a/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c +++ b/drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c @@ -1588,19 +1588,6 @@ static int npcm7xx_get_group_pins(struct pinctrl_dev *pctldev, return 0; } -static int npcm7xx_dt_node_to_map(struct pinctrl_dev *pctldev, - struct device_node *np_config, - struct pinctrl_map **map, - u32 *num_maps) -{ - struct npcm7xx_pinctrl *npcm = pinctrl_dev_get_drvdata(pctldev); - - dev_dbg(npcm->dev, "dt_node_to_map: %s\n", np_config->name); - return pinconf_generic_dt_node_to_map(pctldev, np_config, - map, num_maps, - PIN_MAP_TYPE_INVALID); -} - static void npcm7xx_dt_free_map(struct pinctrl_dev *pctldev, struct pinctrl_map *map, u32 num_maps) { @@ -1612,7 +1599,7 @@ static const struct pinctrl_ops npcm7xx_pinctrl_ops = { .get_group_name = npcm7xx_get_group_name, .get_group_pins = npcm7xx_get_group_pins, .pin_dbg_show = npcm7xx_pin_dbg_show, - .dt_node_to_map = npcm7xx_dt_node_to_map, + .dt_node_to_map = pinconf_generic_dt_node_to_map_all, .dt_free_map = npcm7xx_dt_free_map, }; diff --git a/drivers/pinctrl/nuvoton/pinctrl-wpcm450.c b/drivers/pinctrl/nuvoton/pinctrl-wpcm450.c index 2d1c1652cfd9d373..6e88ef1ed020fa88 100644 --- a/drivers/pinctrl/nuvoton/pinctrl-wpcm450.c +++ b/drivers/pinctrl/nuvoton/pinctrl-wpcm450.c @@ -858,16 +858,6 @@ static int wpcm450_get_group_pins(struct pinctrl_dev *pctldev, return 0; } -static int wpcm450_dt_node_to_map(struct pinctrl_dev *pctldev, - struct device_node *np_config, - struct pinctrl_map **map, - u32 *num_maps) -{ - return pinconf_generic_dt_node_to_map(pctldev, np_config, - map, num_maps, - PIN_MAP_TYPE_INVALID); -} - static void wpcm450_dt_free_map(struct pinctrl_dev *pctldev, struct pinctrl_map *map, u32 num_maps) { @@ -878,7 +868,7 @@ static const struct pinctrl_ops wpcm450_pinctrl_ops = { .get_groups_count = wpcm450_get_groups_count, .get_group_name = wpcm450_get_group_name, .get_group_pins = wpcm450_get_group_pins, - .dt_node_to_map = wpcm450_dt_node_to_map, + .dt_node_to_map = pinconf_generic_dt_node_to_map_all, .dt_free_map = wpcm450_dt_free_map, };
Use the pinconf_generic_dt_node_to_map_all() helper instead of open-coding the same operation, to avoid having to provide custom pinctrl_ops.dt_node_to_map() callbacks. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- This does sacrifice a debug print in the process. Does anyone care? --- drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 15 +-------------- drivers/pinctrl/nuvoton/pinctrl-wpcm450.c | 12 +----------- 2 files changed, 2 insertions(+), 25 deletions(-)