| Message ID | 20231123193355.3400852-17-andriy.shevchenko@linux.intel.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | pinctrl: Convert struct group_desc to use struct pingroup | expand |
Hi Andy, Le jeudi 23 novembre 2023 à 21:31 +0200, Andy Shevchenko a écrit : > Convert drivers to use grp member embedded in struct group_desc. > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Acked-by: Paul Cercueil <paul@crapouillou.net> Cheers, -Paul > --- > drivers/pinctrl/pinctrl-ingenic.c | 18 +++++++++--------- > 1 file changed, 9 insertions(+), 9 deletions(-) > > diff --git a/drivers/pinctrl/pinctrl-ingenic.c > b/drivers/pinctrl/pinctrl-ingenic.c > index 393873de910a..6806fede5df4 100644 > --- a/drivers/pinctrl/pinctrl-ingenic.c > +++ b/drivers/pinctrl/pinctrl-ingenic.c > @@ -3756,17 +3756,17 @@ static int ingenic_pinmux_set_mux(struct > pinctrl_dev *pctldev, > return -EINVAL; > > dev_dbg(pctldev->dev, "enable function %s group %s\n", > - func->name, grp->name); > + func->name, grp->grp.name); > > mode = (uintptr_t)grp->data; > if (mode <= 3) { > - for (i = 0; i < grp->num_pins; i++) > - ingenic_pinmux_set_pin_fn(jzpc, grp- > >pins[i], mode); > + for (i = 0; i < grp->grp.npins; i++) > + ingenic_pinmux_set_pin_fn(jzpc, grp- > >grp.pins[i], mode); > } else { > pin_modes = grp->data; > > - for (i = 0; i < grp->num_pins; i++) > - ingenic_pinmux_set_pin_fn(jzpc, grp- > >pins[i], pin_modes[i]); > + for (i = 0; i < grp->grp.npins; i++) > + ingenic_pinmux_set_pin_fn(jzpc, grp- > >grp.pins[i], pin_modes[i]); > } > > return 0; > @@ -4293,12 +4293,12 @@ static int __init > ingenic_pinctrl_probe(struct platform_device *pdev) > > for (i = 0; i < chip_info->num_groups; i++) { > const struct group_desc *group = &chip_info- > >groups[i]; > + const struct pingroup *grp = &group->grp; > > - err = pinctrl_generic_add_group(jzpc->pctl, group- > >name, > - group->pins, group->num_pins, group- > >data); > + err = pinctrl_generic_add_group(jzpc->pctl, grp- > >name, grp->pins, grp->npins, > + group->data); > if (err < 0) { > - dev_err(dev, "Failed to register group > %s\n", > - group->name); > + dev_err(dev, "Failed to register group > %s\n", grp->name); > return err; > } > }
diff --git a/drivers/pinctrl/pinctrl-ingenic.c b/drivers/pinctrl/pinctrl-ingenic.c index 393873de910a..6806fede5df4 100644 --- a/drivers/pinctrl/pinctrl-ingenic.c +++ b/drivers/pinctrl/pinctrl-ingenic.c @@ -3756,17 +3756,17 @@ static int ingenic_pinmux_set_mux(struct pinctrl_dev *pctldev, return -EINVAL; dev_dbg(pctldev->dev, "enable function %s group %s\n", - func->name, grp->name); + func->name, grp->grp.name); mode = (uintptr_t)grp->data; if (mode <= 3) { - for (i = 0; i < grp->num_pins; i++) - ingenic_pinmux_set_pin_fn(jzpc, grp->pins[i], mode); + for (i = 0; i < grp->grp.npins; i++) + ingenic_pinmux_set_pin_fn(jzpc, grp->grp.pins[i], mode); } else { pin_modes = grp->data; - for (i = 0; i < grp->num_pins; i++) - ingenic_pinmux_set_pin_fn(jzpc, grp->pins[i], pin_modes[i]); + for (i = 0; i < grp->grp.npins; i++) + ingenic_pinmux_set_pin_fn(jzpc, grp->grp.pins[i], pin_modes[i]); } return 0; @@ -4293,12 +4293,12 @@ static int __init ingenic_pinctrl_probe(struct platform_device *pdev) for (i = 0; i < chip_info->num_groups; i++) { const struct group_desc *group = &chip_info->groups[i]; + const struct pingroup *grp = &group->grp; - err = pinctrl_generic_add_group(jzpc->pctl, group->name, - group->pins, group->num_pins, group->data); + err = pinctrl_generic_add_group(jzpc->pctl, grp->name, grp->pins, grp->npins, + group->data); if (err < 0) { - dev_err(dev, "Failed to register group %s\n", - group->name); + dev_err(dev, "Failed to register group %s\n", grp->name); return err; } }
Convert drivers to use grp member embedded in struct group_desc. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- drivers/pinctrl/pinctrl-ingenic.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)