Skip to content

Commit fcbcfe5

Browse files
andy-shevlinusw
authored andcommitted
pinctrl: starfive: Convert to use grp member
Convert drivers to use grp member embedded in struct group_desc, because other members will be removed to avoid duplication and desynchronisation of the generic pin group description. Reviewed-by: Emil Renner Berthing <[email protected]> Signed-off-by: Andy Shevchenko <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Linus Walleij <[email protected]>
1 parent fc7d3b6 commit fcbcfe5

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -654,7 +654,7 @@ static int starfive_set_mux(struct pinctrl_dev *pctldev,
654654
return -EINVAL;
655655

656656
pinmux = group->data;
657-
for (i = 0; i < group->num_pins; i++) {
657+
for (i = 0; i < group->grp.npins; i++) {
658658
u32 v = pinmux[i];
659659
unsigned int gpio = starfive_pinmux_to_gpio(v);
660660
u32 dout = starfive_pinmux_to_dout(v);
@@ -797,7 +797,7 @@ static int starfive_pinconf_group_get(struct pinctrl_dev *pctldev,
797797
if (!group)
798798
return -EINVAL;
799799

800-
return starfive_pinconf_get(pctldev, group->pins[0], config);
800+
return starfive_pinconf_get(pctldev, group->grp.pins[0], config);
801801
}
802802

803803
static int starfive_pinconf_group_set(struct pinctrl_dev *pctldev,
@@ -876,8 +876,8 @@ static int starfive_pinconf_group_set(struct pinctrl_dev *pctldev,
876876
}
877877
}
878878

879-
for (i = 0; i < group->num_pins; i++)
880-
starfive_padctl_rmw(sfp, group->pins[i], mask, value);
879+
for (i = 0; i < group->grp.npins; i++)
880+
starfive_padctl_rmw(sfp, group->grp.pins[i], mask, value);
881881

882882
return 0;
883883
}

drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ static int jh7110_set_mux(struct pinctrl_dev *pctldev,
307307
return -EINVAL;
308308

309309
pinmux = group->data;
310-
for (i = 0; i < group->num_pins; i++) {
310+
for (i = 0; i < group->grp.npins; i++) {
311311
u32 v = pinmux[i];
312312

313313
if (info->jh7110_set_one_pin_mux)
@@ -437,7 +437,7 @@ static int jh7110_pinconf_group_get(struct pinctrl_dev *pctldev,
437437
if (!group)
438438
return -EINVAL;
439439

440-
return jh7110_pinconf_get(pctldev, group->pins[0], config);
440+
return jh7110_pinconf_get(pctldev, group->grp.pins[0], config);
441441
}
442442

443443
static int jh7110_pinconf_group_set(struct pinctrl_dev *pctldev,
@@ -508,8 +508,8 @@ static int jh7110_pinconf_group_set(struct pinctrl_dev *pctldev,
508508
}
509509
}
510510

511-
for (i = 0; i < group->num_pins; i++)
512-
jh7110_padcfg_rmw(sfp, group->pins[i], mask, value);
511+
for (i = 0; i < group->grp.npins; i++)
512+
jh7110_padcfg_rmw(sfp, group->grp.pins[i], mask, value);
513513

514514
return 0;
515515
}

0 commit comments

Comments
 (0)