| Message ID | 20231123193355.3400852-21-andriy.shevchenko@linux.intel.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
| Series | pinctrl: Convert struct group_desc to use struct pingroup | expand |
Andy Shevchenko wrote: > Convert drivers to use grp member embedded in struct group_desc. > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Reviewed-by: Emil Renner Berthing <emil.renner.berthing@canonical.com> > --- > drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c | 8 ++++---- > drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c | 8 ++++---- > 2 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c b/drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c > index ea70b8c61679..21bfbbaede72 100644 > --- a/drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c > +++ b/drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c > @@ -654,7 +654,7 @@ static int starfive_set_mux(struct pinctrl_dev *pctldev, > return -EINVAL; > > pinmux = group->data; > - for (i = 0; i < group->num_pins; i++) { > + for (i = 0; i < group->grp.npins; i++) { > u32 v = pinmux[i]; > unsigned int gpio = starfive_pinmux_to_gpio(v); > u32 dout = starfive_pinmux_to_dout(v); > @@ -797,7 +797,7 @@ static int starfive_pinconf_group_get(struct pinctrl_dev *pctldev, > if (!group) > return -EINVAL; > > - return starfive_pinconf_get(pctldev, group->pins[0], config); > + return starfive_pinconf_get(pctldev, group->grp.pins[0], config); > } > > static int starfive_pinconf_group_set(struct pinctrl_dev *pctldev, > @@ -876,8 +876,8 @@ static int starfive_pinconf_group_set(struct pinctrl_dev *pctldev, > } > } > > - for (i = 0; i < group->num_pins; i++) > - starfive_padctl_rmw(sfp, group->pins[i], mask, value); > + for (i = 0; i < group->grp.npins; i++) > + starfive_padctl_rmw(sfp, group->grp.pins[i], mask, value); > > return 0; > } > diff --git a/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c b/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c > index 9d71e8c13310..60160965cd29 100644 > --- a/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c > +++ b/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c > @@ -307,7 +307,7 @@ static int jh7110_set_mux(struct pinctrl_dev *pctldev, > return -EINVAL; > > pinmux = group->data; > - for (i = 0; i < group->num_pins; i++) { > + for (i = 0; i < group->grp.npins; i++) { > u32 v = pinmux[i]; > > if (info->jh7110_set_one_pin_mux) > @@ -437,7 +437,7 @@ static int jh7110_pinconf_group_get(struct pinctrl_dev *pctldev, > if (!group) > return -EINVAL; > > - return jh7110_pinconf_get(pctldev, group->pins[0], config); > + return jh7110_pinconf_get(pctldev, group->grp.pins[0], config); > } > > static int jh7110_pinconf_group_set(struct pinctrl_dev *pctldev, > @@ -508,8 +508,8 @@ static int jh7110_pinconf_group_set(struct pinctrl_dev *pctldev, > } > } > > - for (i = 0; i < group->num_pins; i++) > - jh7110_padcfg_rmw(sfp, group->pins[i], mask, value); > + for (i = 0; i < group->grp.npins; i++) > + jh7110_padcfg_rmw(sfp, group->grp.pins[i], mask, value); > > return 0; > } > -- > 2.43.0.rc1.1.gbec44491f096 >
diff --git a/drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c b/drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c index ea70b8c61679..21bfbbaede72 100644 --- a/drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c +++ b/drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c @@ -654,7 +654,7 @@ static int starfive_set_mux(struct pinctrl_dev *pctldev, return -EINVAL; pinmux = group->data; - for (i = 0; i < group->num_pins; i++) { + for (i = 0; i < group->grp.npins; i++) { u32 v = pinmux[i]; unsigned int gpio = starfive_pinmux_to_gpio(v); u32 dout = starfive_pinmux_to_dout(v); @@ -797,7 +797,7 @@ static int starfive_pinconf_group_get(struct pinctrl_dev *pctldev, if (!group) return -EINVAL; - return starfive_pinconf_get(pctldev, group->pins[0], config); + return starfive_pinconf_get(pctldev, group->grp.pins[0], config); } static int starfive_pinconf_group_set(struct pinctrl_dev *pctldev, @@ -876,8 +876,8 @@ static int starfive_pinconf_group_set(struct pinctrl_dev *pctldev, } } - for (i = 0; i < group->num_pins; i++) - starfive_padctl_rmw(sfp, group->pins[i], mask, value); + for (i = 0; i < group->grp.npins; i++) + starfive_padctl_rmw(sfp, group->grp.pins[i], mask, value); return 0; } diff --git a/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c b/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c index 9d71e8c13310..60160965cd29 100644 --- a/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c +++ b/drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c @@ -307,7 +307,7 @@ static int jh7110_set_mux(struct pinctrl_dev *pctldev, return -EINVAL; pinmux = group->data; - for (i = 0; i < group->num_pins; i++) { + for (i = 0; i < group->grp.npins; i++) { u32 v = pinmux[i]; if (info->jh7110_set_one_pin_mux) @@ -437,7 +437,7 @@ static int jh7110_pinconf_group_get(struct pinctrl_dev *pctldev, if (!group) return -EINVAL; - return jh7110_pinconf_get(pctldev, group->pins[0], config); + return jh7110_pinconf_get(pctldev, group->grp.pins[0], config); } static int jh7110_pinconf_group_set(struct pinctrl_dev *pctldev, @@ -508,8 +508,8 @@ static int jh7110_pinconf_group_set(struct pinctrl_dev *pctldev, } } - for (i = 0; i < group->num_pins; i++) - jh7110_padcfg_rmw(sfp, group->pins[i], mask, value); + for (i = 0; i < group->grp.npins; i++) + jh7110_padcfg_rmw(sfp, group->grp.pins[i], mask, value); return 0; }
Convert drivers to use grp member embedded in struct group_desc. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c | 8 ++++---- drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-)