pinctrl: nuvoton: A few cleanups
Subsystems (5)
cover pinctrl: nuvoton: A few cleanups
Convert Nuvoton drivers to use pin control provided data types and more of device property APIs.
Not tested.
Andy Shevchenko (4):
pinctrl: nuvoton: Convert to use struct pingroup and
PINCTRL_PINGROUP()
pinctrl: nuvoton: Make use of struct pinfunction and
PINCTRL_PINFUNCTION()
pinctrl: nuvoton: Convert to use struct group_desc
pinctrl: nuvoton: Reduce use of OF-specific APIs
drivers/pinctrl/nuvoton/pinctrl-ma35.c | 116 ++++++++++------------ drivers/pinctrl/nuvoton/pinctrl-ma35d1.c | 1 - drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 43 ++------ drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c | 29 ++---- drivers/pinctrl/nuvoton/pinctrl-wpcm450.c | 11 +- 5 files changed, 71 insertions(+), 129 deletions(-)
Signature · 1 line
2.45.2
PATCH 1/4 pinctrl: nuvoton: Convert to use struct pingroup and PINCTRL_PINGROUP()
From: Andy Shevchenko <[email protected]>
The pin control header provides struct pingroup and PINCTRL_PINGROUP() macro. Utilize them instead of open coded variants in the driver.
--- drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 16 ++-------------- drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c | 16 ++-------------- 2 files changed, 4 insertions(+), 28 deletions(-)
drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c +2 -14
@@ -504,17 +504,6 @@ static const int lkgpo2_pins[] = { 9 };static const int nprd_smi_pins[] = {190 }; -/* -* pin: name, number -* group: name, npins, pins -* function: name, ngroups, groups -*/ -struct npcm7xx_group { -const char *name; -const unsigned int *pins; -int npins; -}; -#define NPCM7XX_GRPS \ NPCM7XX_GRP(smb0), \ NPCM7XX_GRP(smb0b), \
@@ -642,9 +631,8 @@ enum {#undef NPCM7XX_GRP }; -static struct npcm7xx_group npcm7xx_groups[] = { -#define NPCM7XX_GRP(x) { .name = #x, .pins = x ## _pins, \ - .npins = ARRAY_SIZE(x ## _pins) } +static struct pingroup npcm7xx_groups[] = { +#define NPCM7XX_GRP(x) PINCTRL_PINGROUP(#x, x ## _pins, ARRAY_SIZE(x ## _pins)) NPCM7XX_GRPS#undef NPCM7XX_GRP };
drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c +2 -14
@@ -588,17 +588,6 @@ static const int hgpio5_pins[] = { 25 };static const int hgpio6_pins[] = {59 };static const int hgpio7_pins[] = {60 }; -/* -* pin: name, number -* group: name, npins, pins -* function: name, ngroups, groups -*/ -struct npcm8xx_pingroup { -const char *name; -const unsigned int *pins; -int npins; -}; -#define NPCM8XX_GRPS \ NPCM8XX_GRP(gpi36), \ NPCM8XX_GRP(gpi35), \
@@ -832,9 +821,8 @@ enum {#undef NPCM8XX_GRP }; -static struct npcm8xx_pingroup npcm8xx_pingroups[] = { -#define NPCM8XX_GRP(x) { .name = #x, .pins = x ## _pins, \ - .npins = ARRAY_SIZE(x ## _pins) } +static struct pingroup npcm8xx_pingroups[] = { +#define NPCM8XX_GRP(x) PINCTRL_PINGROUP(#x, x ## _pins, ARRAY_SIZE(x ## _pins)) NPCM8XX_GRPS#undef NPCM8XX_GRP };
Signature · 1 line
2.45.2
PATCH 2/4 pinctrl: nuvoton: Make use of struct pinfunction and PINCTRL_PINFUNCTION()
In reply to Andy ShevchenkoFrom: Andy Shevchenko <[email protected]>
Since pin control provides a generic data type and a macro for the pin function definition, use them in the driver.
--- drivers/pinctrl/nuvoton/pinctrl-ma35.c | 19 ++++++++----------- drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 11 +++-------- drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c | 11 +++-------- drivers/pinctrl/nuvoton/pinctrl-wpcm450.c | 11 +++-------- 4 files changed, 17 insertions(+), 35 deletions(-)
drivers/pinctrl/nuvoton/pinctrl-ma35.c +8 -11
@@ -98,12 +98,6 @@ static const u32 ds_3300mv_tbl[] = { 17100, 25600, 34100, 42800, 48000, 56000, 77000, 82000, }; -struct ma35_pin_func { -const char *name; -const char **groups; -u32 ngroups; -}; -struct ma35_pin_setting {u32 offset;u32 shift;
@@ -149,7 +143,7 @@ struct ma35_pinctrl {struct regmap *regmap;struct ma35_pin_group *groups;unsigned int ngroups; -struct ma35_pin_func *functions; +struct pinfunction *functions;unsigned int nfunctions; };
@@ -1041,9 +1035,10 @@ static int ma35_pinctrl_parse_functions(struct device_node *np, struct ma35_pinc u32 index) {struct device_node *child; -struct ma35_pin_func *func; +struct pinfunction *func;struct ma35_pin_group *grp;static u32 grp_index; +const char **groups;u32 ret, i =0 ;dev_dbg (npctl->dev,"parse function(%d): %s\n" , index, np->name);
@@ -1055,12 +1050,12 @@ static int ma35_pinctrl_parse_functions(struct device_node *np, struct ma35_pincif (func->ngroups <=0 )return 0 ; - func->groups =devm_kcalloc (npctl->dev, func->ngroups,sizeof (char *),GFP_KERNEL ); -if (!func->groups) + groups =devm_kcalloc (npctl->dev, func->ngroups,sizeof (*groups),GFP_KERNEL ); +if (!groups)return -ENOMEM ;for_each_child_of_node (np, child) { - func->groups[i] = child->name; + groups[i] = child->name; grp = &npctl->groups[grp_index++]; ret =ma35_pinctrl_parse_groups (child, grp, npctl, i++);if (ret) {
@@ -1068,6 +1063,8 @@ static int ma35_pinctrl_parse_functions(struct device_node *np, struct ma35_pincreturn ret; } } + + func->groups = groups;return 0 ; }
drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c +3 -8
@@ -639,13 +639,6 @@ static struct pingroup npcm7xx_groups[] = {#define NPCM7XX_SFUNC (a) NPCM7XX_FUNC(a, #a) #define NPCM7XX_FUNC(a, b...) static const char *a ## _grp[] = { b } -#define NPCM7XX_MKFUNC (nm) { .name = #nm, .ngroups = ARRAY_SIZE(nm ## _grp), \ - .groups = nm ## _grp } -struct npcm7xx_func { -const char *name; -const unsigned int ngroups; -const char *const *groups; -};NPCM7XX_SFUNC (smb0);NPCM7XX_SFUNC (smb0b);
@@ -764,7 +757,8 @@ NPCM7XX_SFUNC(lkgpo2);NPCM7XX_SFUNC (nprd_smi);/* Function names */ -static struct npcm7xx_func npcm7xx_funcs[] = { +static struct pinfunction npcm7xx_funcs[] = { +#define NPCM7XX_MKFUNC(nm) PINCTRL_PINFUNCTION(#nm, nm ## _grp, ARRAY_SIZE(nm ## _grp))NPCM7XX_MKFUNC (smb0),NPCM7XX_MKFUNC (smb0b), NPCM7XX_MKFUNC(smb0c),
@@ -880,6 +874,7 @@ static struct npcm7xx_func npcm7xx_funcs[] = {NPCM7XX_MKFUNC (lkgpo1),NPCM7XX_MKFUNC (lkgpo2),NPCM7XX_MKFUNC (nprd_smi), +#undef NPCM7XX_MKFUNC };#define NPCM7XX_PINCFG (a, b, c, d, e, f, g, h, i, j, k) \
drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c +3 -8
@@ -829,13 +829,6 @@ static struct pingroup npcm8xx_pingroups[] = {#define NPCM8XX_SFUNC (a) NPCM8XX_FUNC(a, #a) #define NPCM8XX_FUNC(a, b...) static const char *a ## _grp[] = { b } -#define NPCM8XX_MKFUNC (nm) { .name = #nm, .ngroups = ARRAY_SIZE(nm ## _grp), \ - .groups = nm ## _grp } -struct npcm8xx_func { -const char *name; -const unsigned int ngroups; -const char *const *groups; -};NPCM8XX_SFUNC (gpi36);NPCM8XX_SFUNC (gpi35);
@@ -1060,7 +1053,8 @@ NPCM8XX_SFUNC(hgpio6);NPCM8XX_SFUNC (hgpio7);/* Function names */ -static struct npcm8xx_func npcm8xx_funcs[] = { +static struct pinfunction npcm8xx_funcs[] = { +#define NPCM8XX_MKFUNC(nm) PINCTRL_PINFUNCTION(#nm, nm ## _grp, ARRAY_SIZE(nm ## _grp))NPCM8XX_MKFUNC (gpi36),NPCM8XX_MKFUNC (gpi35), NPCM8XX_MKFUNC(tp_jtag3),
@@ -1282,6 +1276,7 @@ static struct npcm8xx_func npcm8xx_funcs[] = {NPCM8XX_MKFUNC (hgpio5),NPCM8XX_MKFUNC (hgpio6),NPCM8XX_MKFUNC (hgpio7), +#undef NPCM8XX_MKFUNC };#define NPCM8XX_PINCFG (a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q) \
drivers/pinctrl/nuvoton/pinctrl-wpcm450.c +3 -8
@@ -482,13 +482,6 @@ static const struct pingroup wpcm450_groups[] = {#define WPCM450_SFUNC (a) WPCM450_FUNC(a, #a) #define WPCM450_FUNC(a, b...) static const char *a ## _grp[] = { b } -#define WPCM450_MKFUNC (nm) { .name = #nm, .ngroups = ARRAY_SIZE(nm ## _grp), \ - .groups = nm ## _grp } -struct wpcm450_func { -const char *name; -const unsigned int ngroups; -const char *const *groups; -};WPCM450_SFUNC (smb3);WPCM450_SFUNC (smb4);
@@ -555,7 +548,8 @@ WPCM450_FUNC(gpio, WPCM450_GRPS);#undef WPCM450_GRP/* Function names */ -static struct wpcm450_func wpcm450_funcs[] = { +static struct pinfunction wpcm450_funcs[] = { +#define WPCM450_MKFUNC(nm) PINCTRL_PINFUNCTION(#nm, nm ## _grp, ARRAY_SIZE(nm ## _grp))WPCM450_MKFUNC (smb3),WPCM450_MKFUNC (smb4), WPCM450_MKFUNC(smb5),
@@ -616,6 +610,7 @@ static struct wpcm450_func wpcm450_funcs[] = {WPCM450_MKFUNC (hg6),WPCM450_MKFUNC (hg7),WPCM450_MKFUNC (gpio), +#undef WPCM450_MKFUNC };#define WPCM450_PINCFG (a, b, c, d, e, f, g) \
Signature · 1 line
2.45.2
Re: [PATCH v1 2/4] pinctrl: nuvoton: Make use of struct pinfunction and PINCTRL_PINFUNCTION()
Hi,
Quoted 7 lines · Andy Shevchenko
From: Andy Shevchenko <[email protected]>
Since pin control provides a generic data type and a macro for the pin function definition, use them in the driver.
Signed-off-by Andy Shevchenko <[email protected]>---
Thanks for your patch, it's always good to see code simplifications like this!
Quoted 180 lines
drivers/pinctrl/nuvoton/pinctrl-ma35.c | 19 ++++++++----------- drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 11 +++-------- drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c | 11 +++-------- drivers/pinctrl/nuvoton/pinctrl-wpcm450.c | 11 +++-------- 4 files changed, 17 insertions(+), 35 deletions(-)drivers/pinctrl/nuvoton/pinctrl-ma35.c +8
-11@@ -98,12 +98,6 @@ static const u32 ds_3300mv_tbl[] = { 17100, 25600, 34100, 42800, 48000, 56000, 77000, 82000, }; -struct ma35_pin_func { -const char *name; -const char **groups; -u32 ngroups; -}; -struct ma35_pin_setting {u32 offset;u32 shift;@@ -149,7 +143,7 @@ struct ma35_pinctrl {struct regmap *regmap;struct ma35_pin_group *groups;unsigned int ngroups; -struct ma35_pin_func *functions; +struct pinfunction *functions;unsigned int nfunctions; };@@ -1041,9 +1035,10 @@ static int ma35_pinctrl_parse_functions(struct device_node *np, struct ma35_pinc u32 index) {struct device_node *child; -struct ma35_pin_func *func; +struct pinfunction *func;struct ma35_pin_group *grp;static u32 grp_index; +const char **groups;u32 ret, i =0 ;dev_dbg (npctl->dev,"parse function(%d): %s\n" , index, np->name);@@ -1055,12 +1050,12 @@ static int ma35_pinctrl_parse_functions(struct device_node *np, struct ma35_pincif (func->ngroups <=0 )return 0 ; - func->groups =devm_kcalloc (npctl->dev, func->ngroups,sizeof (char *),GFP_KERNEL ); -if (!func->groups) + groups =devm_kcalloc (npctl->dev, func->ngroups,sizeof (*groups),GFP_KERNEL ); +if (!groups)return -ENOMEM ;for_each_child_of_node (np, child) { - func->groups[i] = child->name; + groups[i] = child->name; grp = &npctl->groups[grp_index++]; ret =ma35_pinctrl_parse_groups (child, grp, npctl, i++);if (ret) {@@ -1068,6 +1063,8 @@ static int ma35_pinctrl_parse_functions(struct device_node *np, struct ma35_pincreturn ret; } } + + func->groups = groups;return 0 ; }drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c +3
-8@@ -639,13 +639,6 @@ static struct pingroup npcm7xx_groups[] = {#define NPCM7XX_SFUNC (a) NPCM7XX_FUNC(a, #a) #define NPCM7XX_FUNC(a, b...) static const char *a ## _grp[] = { b } -#define NPCM7XX_MKFUNC (nm) { .name = #nm, .ngroups = ARRAY_SIZE(nm ## _grp), \ - .groups = nm ## _grp } -struct npcm7xx_func { -const char *name; -const unsigned int ngroups; -const char *const *groups; -};NPCM7XX_SFUNC (smb0);NPCM7XX_SFUNC (smb0b);@@ -764,7 +757,8 @@ NPCM7XX_SFUNC(lkgpo2);NPCM7XX_SFUNC (nprd_smi);/* Function names */ -static struct npcm7xx_func npcm7xx_funcs[] = { +static struct pinfunction npcm7xx_funcs[] = { +#define NPCM7XX_MKFUNC(nm) PINCTRL_PINFUNCTION(#nm, nm ## _grp, ARRAY_SIZE(nm ## _grp))NPCM7XX_MKFUNC (smb0),NPCM7XX_MKFUNC (smb0b), NPCM7XX_MKFUNC(smb0c),@@ -880,6 +874,7 @@ static struct npcm7xx_func npcm7xx_funcs[] = {NPCM7XX_MKFUNC (lkgpo1),NPCM7XX_MKFUNC (lkgpo2),NPCM7XX_MKFUNC (nprd_smi), +#undef NPCM7XX_MKFUNC };#define NPCM7XX_PINCFG (a, b, c, d, e, f, g, h, i, j, k) \drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c +3
-8@@ -829,13 +829,6 @@ static struct pingroup npcm8xx_pingroups[] = {#define NPCM8XX_SFUNC (a) NPCM8XX_FUNC(a, #a) #define NPCM8XX_FUNC(a, b...) static const char *a ## _grp[] = { b } -#define NPCM8XX_MKFUNC (nm) { .name = #nm, .ngroups = ARRAY_SIZE(nm ## _grp), \ - .groups = nm ## _grp } -struct npcm8xx_func { -const char *name; -const unsigned int ngroups; -const char *const *groups; -};NPCM8XX_SFUNC (gpi36);NPCM8XX_SFUNC (gpi35);@@ -1060,7 +1053,8 @@ NPCM8XX_SFUNC(hgpio6);NPCM8XX_SFUNC (hgpio7);/* Function names */ -static struct npcm8xx_func npcm8xx_funcs[] = { +static struct pinfunction npcm8xx_funcs[] = { +#define NPCM8XX_MKFUNC(nm) PINCTRL_PINFUNCTION(#nm, nm ## _grp, ARRAY_SIZE(nm ## _grp))NPCM8XX_MKFUNC (gpi36),NPCM8XX_MKFUNC (gpi35), NPCM8XX_MKFUNC(tp_jtag3),@@ -1282,6 +1276,7 @@ static struct npcm8xx_func npcm8xx_funcs[] = {NPCM8XX_MKFUNC (hgpio5),NPCM8XX_MKFUNC (hgpio6),NPCM8XX_MKFUNC (hgpio7), +#undef NPCM8XX_MKFUNC };#define NPCM8XX_PINCFG (a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q) \drivers/pinctrl/nuvoton/pinctrl-wpcm450.c +3
-9@@ -482,13 +482,6 @@ static const struct pingroup wpcm450_groups[] = {#define WPCM450_SFUNC (a) WPCM450_FUNC(a, #a) #define WPCM450_FUNC(a, b...) static const char *a ## _grp[] = { b } -#define WPCM450_MKFUNC (nm) { .name = #nm, .ngroups = ARRAY_SIZE(nm ## _grp), \ - .groups = nm ## _grp } -struct wpcm450_func { -const char *name; -const unsigned int ngroups; -const char *const *groups; -};WPCM450_SFUNC (smb3);WPCM450_SFUNC (smb4);@@ -555,7 +548,8 @@ WPCM450_FUNC(gpio, WPCM450_GRPS);#undef WPCM450_GRP/* Function names */ -static struct wpcm450_func wpcm450_funcs[] = { +static struct pinfunction wpcm450_funcs[] = { +#define WPCM450_MKFUNC(nm) PINCTRL_PINFUNCTION(#nm, nm ## _grp, ARRAY_SIZE(nm ## _grp))WPCM450_MKFUNC (smb3),WPCM450_MKFUNC (smb4), WPCM450_MKFUNC(smb5),@@ -616,6 +610,7 @@ static struct wpcm450_func wpcm450_funcs[] = {WPCM450_MKFUNC (hg6),WPCM450_MKFUNC (hg7),WPCM450_MKFUNC (gpio), +#undef WPCM450_MKFUNC };#define WPCM450_PINCFG (a, b, c, d, e, f, g) \ --2.45.2
PATCH 3/4 pinctrl: nuvoton: Convert to use struct group_desc
In reply to Andy ShevchenkoFrom: Andy Shevchenko <[email protected]>
The pin control core header provides struct group_desc. Utilize it instead of open coded variants in the driver.
--- drivers/pinctrl/nuvoton/pinctrl-ma35.c | 66 ++++++++++++-------------- 1 file changed, 31 insertions(+), 35 deletions(-)
drivers/pinctrl/nuvoton/pinctrl-ma35.c +31 -35
@@ -106,13 +106,6 @@ struct ma35_pin_setting {unsigned int nconfigs; }; -struct ma35_pin_group { -const char *name; -unsigned int npins; -unsigned int *pins; -struct ma35_pin_setting *settings; -}; -struct ma35_pin_bank {void __iomem *reg_base;struct clk *clk;
@@ -141,7 +134,7 @@ struct ma35_pinctrl {struct pinctrl_dev *pctl;const struct ma35_pinctrl_soc_info *info;struct regmap *regmap; -struct ma35_pin_group *groups; +struct group_desc *groups;unsigned int ngroups;struct pinfunction *functions;unsigned int nfunctions;
@@ -160,7 +153,7 @@ static const char *ma35_get_group_name(struct pinctrl_dev *pctldev, unsigned int {struct ma35_pinctrl *npctl =pinctrl_dev_get_drvdata (pctldev); -return npctl->groups[selector].name; +return npctl->groups[selector].grp.name; } static int ma35_get_group_pins(struct pinctrl_dev *pctldev, unsigned int selector,
@@ -171,19 +164,19 @@ static int ma35_get_group_pins(struct pinctrl_dev *pctldev, unsigned int selectoif (selector >= npctl->ngroups)return -EINVAL ; - *pins = npctl->groups[selector].pins; - *npins = npctl->groups[selector].npins; + *pins = npctl->groups[selector].grp.pins; + *npins = npctl->groups[selector].grp.npins;return 0 ; } -static struct ma35_pin_group *ma35_pinctrl_find_group_by_name ( -const struct ma35_pinctrl *npctl,const char *name) +static struct group_desc * +ma35_pinctrl_find_group_by_name (const struct ma35_pinctrl *npctl,const char *name) {int i;for (i =0 ; i < npctl->ngroups; i++) { -if (!strcmp (npctl->groups[i].name, name)) +if (!strcmp (npctl->groups[i].grp.name, name))return &npctl->groups[i]; }return NULL ;
@@ -195,9 +188,10 @@ static int ma35_pinctrl_dt_node_to_map_func(struct pinctrl_dev *pctldev, unsigned int *num_maps) {struct ma35_pinctrl *npctl =pinctrl_dev_get_drvdata (pctldev); -struct ma35_pin_group *grp; +struct ma35_pin_setting *setting;struct pinctrl_map *new_map;struct device_node *parent; +struct group_desc *grp;int map_num =1 ;int i;
@@ -211,7 +205,7 @@ static int ma35_pinctrl_dt_node_to_map_func(struct pinctrl_dev *pctldev,return -EINVAL ; } - map_num += grp->npins; + map_num += grp->grp.npins; new_map =devm_kcalloc (pctldev->dev, map_num,sizeof (*new_map),GFP_KERNEL );if (!new_map)return -ENOMEM ;
@@ -223,6 +217,8 @@ static int ma35_pinctrl_dt_node_to_map_func(struct pinctrl_dev *pctldev,if (!parent)return -EINVAL ; + setting = grp->data; + new_map[0 ].type =PIN_MAP_TYPE_MUX_GROUP ; new_map[0 ].data.mux.function = parent->name; new_map[0 ].data.mux.group = np->name;
@@ -231,9 +227,9 @@ static int ma35_pinctrl_dt_node_to_map_func(struct pinctrl_dev *pctldev, new_map++;for (i =0 ; i < grp->npins; i++) { new_map[i].type =PIN_MAP_TYPE_CONFIGS_PIN ; - new_map[i].data.configs.group_or_pin =pin_get_name (pctldev, grp->pins[i]); - new_map[i].data.configs.configs = grp->settings[i].configs; - new_map[i].data.configs.num_configs = grp->settings[i].nconfigs; + new_map[i].data.configs.group_or_pin =pin_get_name (pctldev, grp->grp.pins[i]); + new_map[i].data.configs.configs = setting[i].configs; + new_map[i].data.configs.num_configs = setting[i].nconfigs; }dev_dbg (pctldev->dev,"maps: function %s group %s num %d\n" , (*map)->data.mux.function, (*map)->data.mux.group, map_num);
@@ -281,12 +277,12 @@ static int ma35_pinmux_set_mux(struct pinctrl_dev *pctldev, unsigned int selecto unsigned int group) {struct ma35_pinctrl *npctl =pinctrl_dev_get_drvdata (pctldev); -struct ma35_pin_group *grp = &npctl->groups[group]; -struct ma35_pin_setting *setting = grp->settings; +struct group_desc *grp = &npctl->groups[group]; +struct ma35_pin_setting *setting = grp->data;u32 i, regval;dev_dbg (npctl->dev,"enable function %s group %s\n" , - npctl->functions[selector].name, npctl->groups[group].name); + npctl->functions[selector].name, grp->grp.name);for (i =0 ; i < grp->npins; i++) {regmap_read (npctl->regmap, setting->offset, ®val);
@@ -980,17 +976,16 @@ static const struct pinconf_ops ma35_pinconf_ops = { .is_generic = true, }; -static int ma35_pinctrl_parse_groups (struct device_node *np,struct ma35_pin_group *grp, +static int ma35_pinctrl_parse_groups (struct device_node *np,struct group_desc *grp,struct ma35_pinctrl *npctl,u32 index) {struct ma35_pin_setting *pin;unsigned long *configs;unsigned int nconfigs; +unsigned int *pins;int i, j, count, ret;u32 *elems; - grp->name = np->name; - ret =pinconf_generic_parse_dt_config (np,NULL , &configs, &nconfigs);if (ret)return ret;
@@ -1003,21 +998,22 @@ static int ma35_pinctrl_parse_groups(struct device_node *np, struct ma35_pin_groif (!elems)return -ENOMEM ; + grp->grp.name = np->name; + ret =of_property_read_u32_array (np,"nuvoton,pins" , elems, count);if (ret)return -EINVAL ; + grp->grp.npins = count /3 ; - grp->npins = count /3 ; - - grp->pins =devm_kcalloc (npctl->dev, grp->npins,sizeof (*grp->pins),GFP_KERNEL ); -if (!grp->pins) + pins =devm_kcalloc (npctl->dev, grp->grp.npins,sizeof (*pins),GFP_KERNEL ); +if (!pins)return -ENOMEM ; + grp->grp.pins = pins; - grp->settings =devm_kcalloc (npctl->dev, grp->npins,sizeof (*grp->settings),GFP_KERNEL ); -if (!grp->settings) + pin =devm_kcalloc (npctl->dev, grp->grp.npins,sizeof (*pin),GFP_KERNEL ); +if (!pin)return -ENOMEM ; - - pin = grp->settings; + grp->data = pin;for (i =0 , j =0 ; i < count; i +=3 , j++) { pin->offset = elems[i] *MA35_MFP_REG_SZ_PER_BANK +MA35_MFP_REG_BASE ;
@@ -1025,7 +1021,7 @@ static int ma35_pinctrl_parse_groups(struct device_node *np, struct ma35_pin_gro pin->muxval = elems[i +2 ]; pin->configs = configs; pin->nconfigs = nconfigs; - grp->pins[j] = npctl->info->get_pin_num (pin->offset, pin->shift); + pins[j] = npctl->info->get_pin_num (pin->offset, pin->shift); pin++; }return 0 ;
@@ -1036,7 +1032,7 @@ static int ma35_pinctrl_parse_functions(struct device_node *np, struct ma35_pinc {struct device_node *child;struct pinfunction *func; -struct ma35_pin_group *grp; +struct group_desc *grp;static u32 grp_index;const char **groups;u32 ret, i =0 ;
Signature · 1 line
2.45.2
kernel test robot
build botRe: [PATCH v1 3/4] pinctrl: nuvoton: Convert to use struct group_desc
kernel test robot noticed the following build errors:
Hi Andy,
kernel test robot noticed the following build errors:
[auto build test ERROR on linusw-pinctrl/devel]
[also build test ERROR on linusw-pinctrl/for-next next-20240611] [cannot apply to linus/master v6.10-rc3]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Andy-Shevchenko/pinctrl-nuvoton-Convert-to-use-struct-pingroup-and-PINCTRL_PINGROUP/20240611-173545 base: https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git devel patch link: https://lore.kernel.org/r/20240611093127.90210-4-andy.shevchenko%40gmail.com patch subject: [PATCH v1 3/4] pinctrl: nuvoton: Convert to use struct group_desc config: hexagon-allmodconfig (https://download.01.org/0day-ci/archive/20240612/[email protected]/config) compiler: clang version 19.0.0git (https://github.com/llvm/llvm-project 4403cdbaf01379de96f8d0d6ea4f51a085e37766) reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240612/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All errors (new ones prefixed by >>):
In file included from drivers/pinctrl/nuvoton/pinctrl-ma35.c:13:
In file included from include/linux/gpio/driver.h:8:
In file included from include/linux/irqchip/chained_irq.h:10:
In file included from include/linux/irq.h:20:
In file included from include/linux/io.h:14:
In file included from arch/hexagon/include/asm/io.h:328:
include/asm-generic/io.h:548:31: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
548 | val = __raw_readb(PCI_IOBASE + addr);
| ~~~~~~~~~~ ^
include/asm-generic/io.h:561:61: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
561 | val = __le16_to_cpu((__le16 __force)__raw_readw(PCI_IOBASE + addr));
| ~~~~~~~~~~ ^
include/uapi/linux/byteorder/little_endian.h:37:51: note: expanded from macro '__le16_to_cpu'
37 | #define __le16_to_cpu(x) ((__force __u16)(__le16)(x))
| ^
In file included from drivers/pinctrl/nuvoton/pinctrl-ma35.c:13:
In file included from include/linux/gpio/driver.h:8:
In file included from include/linux/irqchip/chained_irq.h:10:
In file included from include/linux/irq.h:20:
In file included from include/linux/io.h:14:
In file included from arch/hexagon/include/asm/io.h:328:
include/asm-generic/io.h:574:61: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
574 | val = __le32_to_cpu((__le32 __force)__raw_readl(PCI_IOBASE + addr));
| ~~~~~~~~~~ ^
include/uapi/linux/byteorder/little_endian.h:35:51: note: expanded from macro '__le32_to_cpu'
35 | #define __le32_to_cpu(x) ((__force __u32)(__le32)(x))
| ^
In file included from drivers/pinctrl/nuvoton/pinctrl-ma35.c:13:
In file included from include/linux/gpio/driver.h:8:
In file included from include/linux/irqchip/chained_irq.h:10:
In file included from include/linux/irq.h:20:
In file included from include/linux/io.h:14:
In file included from arch/hexagon/include/asm/io.h:328:
include/asm-generic/io.h:585:33: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
585 | __raw_writeb(value, PCI_IOBASE + addr);
| ~~~~~~~~~~ ^
include/asm-generic/io.h:595:59: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
595 | __raw_writew((u16 __force)cpu_to_le16(value), PCI_IOBASE + addr);
| ~~~~~~~~~~ ^
include/asm-generic/io.h:605:59: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
605 | __raw_writel((u32 __force)cpu_to_le32(value), PCI_IOBASE + addr);
| ~~~~~~~~~~ ^
>> drivers/pinctrl/nuvoton/pinctrl-ma35.c:228:23: error: no member named 'npins' in 'struct group_desc' 228 | for (i = 0; i < grp->npins; i++) {
| ~~~ ^
drivers/pinctrl/nuvoton/pinctrl-ma35.c:287:23: error: no member named 'npins' in 'struct group_desc'
287 | for (i = 0; i < grp->npins; i++) {
| ~~~ ^
6 warnings and 2 errors generated.
vim +228 drivers/pinctrl/nuvoton/pinctrl-ma35.c
ecc5bf86867344 Jacky Huang 2024-05-21 184
ecc5bf86867344 Jacky Huang 2024-05-21 185 static int ma35_pinctrl_dt_node_to_map_func(struct pinctrl_dev *pctldev,
ecc5bf86867344 Jacky Huang 2024-05-21 186 struct device_node *np,
ecc5bf86867344 Jacky Huang 2024-05-21 187 struct pinctrl_map **map,
ecc5bf86867344 Jacky Huang 2024-05-21 188 unsigned int *num_maps)
ecc5bf86867344 Jacky Huang 2024-05-21 189 {
ecc5bf86867344 Jacky Huang 2024-05-21 190 struct ma35_pinctrl *npctl = pinctrl_dev_get_drvdata(pctldev);
888aa25ee6ce72 Andy Shevchenko 2024-06-11 191 struct ma35_pin_setting *setting;
ecc5bf86867344 Jacky Huang 2024-05-21 192 struct pinctrl_map *new_map;
ecc5bf86867344 Jacky Huang 2024-05-21 193 struct device_node *parent;
888aa25ee6ce72 Andy Shevchenko 2024-06-11 194 struct group_desc *grp;
ecc5bf86867344 Jacky Huang 2024-05-21 195 int map_num = 1;
ecc5bf86867344 Jacky Huang 2024-05-21 196 int i;
ecc5bf86867344 Jacky Huang 2024-05-21 197
ecc5bf86867344 Jacky Huang 2024-05-21 198 /*
ecc5bf86867344 Jacky Huang 2024-05-21 199 * first find the group of this node and check if we need create
ecc5bf86867344 Jacky Huang 2024-05-21 200 * config maps for pins
ecc5bf86867344 Jacky Huang 2024-05-21 201 */
ecc5bf86867344 Jacky Huang 2024-05-21 202 grp = ma35_pinctrl_find_group_by_name(npctl, np->name);
ecc5bf86867344 Jacky Huang 2024-05-21 203 if (!grp) {
ecc5bf86867344 Jacky Huang 2024-05-21 204 dev_err(npctl->dev, "unable to find group for node %s\n", np->name);
ecc5bf86867344 Jacky Huang 2024-05-21 205 return -EINVAL;
ecc5bf86867344 Jacky Huang 2024-05-21 206 }
ecc5bf86867344 Jacky Huang 2024-05-21 207
888aa25ee6ce72 Andy Shevchenko 2024-06-11 208 map_num += grp->grp.npins;
ecc5bf86867344 Jacky Huang 2024-05-21 209 new_map = devm_kcalloc(pctldev->dev, map_num, sizeof(*new_map), GFP_KERNEL);
ecc5bf86867344 Jacky Huang 2024-05-21 210 if (!new_map)
ecc5bf86867344 Jacky Huang 2024-05-21 211 return -ENOMEM;
ecc5bf86867344 Jacky Huang 2024-05-21 212
ecc5bf86867344 Jacky Huang 2024-05-21 213 *map = new_map;
ecc5bf86867344 Jacky Huang 2024-05-21 214 *num_maps = map_num;
ecc5bf86867344 Jacky Huang 2024-05-21 215 /* create mux map */
ecc5bf86867344 Jacky Huang 2024-05-21 216 parent = of_get_parent(np);
ecc5bf86867344 Jacky Huang 2024-05-21 217 if (!parent)
ecc5bf86867344 Jacky Huang 2024-05-21 218 return -EINVAL;
ecc5bf86867344 Jacky Huang 2024-05-21 219
888aa25ee6ce72 Andy Shevchenko 2024-06-11 220 setting = grp->data;
888aa25ee6ce72 Andy Shevchenko 2024-06-11 221
ecc5bf86867344 Jacky Huang 2024-05-21 222 new_map[0].type = PIN_MAP_TYPE_MUX_GROUP;
ecc5bf86867344 Jacky Huang 2024-05-21 223 new_map[0].data.mux.function = parent->name;
ecc5bf86867344 Jacky Huang 2024-05-21 224 new_map[0].data.mux.group = np->name;
ecc5bf86867344 Jacky Huang 2024-05-21 225 of_node_put(parent);
ecc5bf86867344 Jacky Huang 2024-05-21 226
ecc5bf86867344 Jacky Huang 2024-05-21 227 new_map++;
ecc5bf86867344 Jacky Huang 2024-05-21 @228 for (i = 0; i < grp->npins; i++) {
ecc5bf86867344 Jacky Huang 2024-05-21 229 new_map[i].type = PIN_MAP_TYPE_CONFIGS_PIN;
888aa25ee6ce72 Andy Shevchenko 2024-06-11 230 new_map[i].data.configs.group_or_pin = pin_get_name(pctldev, grp->grp.pins[i]);
888aa25ee6ce72 Andy Shevchenko 2024-06-11 231 new_map[i].data.configs.configs = setting[i].configs;
888aa25ee6ce72 Andy Shevchenko 2024-06-11 232 new_map[i].data.configs.num_configs = setting[i].nconfigs;
ecc5bf86867344 Jacky Huang 2024-05-21 233 }
ecc5bf86867344 Jacky Huang 2024-05-21 234 dev_dbg(pctldev->dev, "maps: function %s group %s num %d\n",
ecc5bf86867344 Jacky Huang 2024-05-21 235 (*map)->data.mux.function, (*map)->data.mux.group, map_num);
ecc5bf86867344 Jacky Huang 2024-05-21 236
ecc5bf86867344 Jacky Huang 2024-05-21 237 return 0;
ecc5bf86867344 Jacky Huang 2024-05-21 238 }
ecc5bf86867344 Jacky Huang 2024-05-21 239 Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
kernel test robot
build botRe: [PATCH v1 3/4] pinctrl: nuvoton: Convert to use struct group_desc
In reply to Andy Shevchenkokernel test robot noticed the following build errors:
Hi Andy,
kernel test robot noticed the following build errors:
[auto build test ERROR on linusw-pinctrl/devel]
[also build test ERROR on linusw-pinctrl/for-next next-20240611] [cannot apply to linus/master v6.10-rc3]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Andy-Shevchenko/pinctrl-nuvoton-Convert-to-use-struct-pingroup-and-PINCTRL_PINGROUP/20240611-173545 base: https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git devel patch link: https://lore.kernel.org/r/20240611093127.90210-4-andy.shevchenko%40gmail.com patch subject: [PATCH v1 3/4] pinctrl: nuvoton: Convert to use struct group_desc config: alpha-allyesconfig (https://download.01.org/0day-ci/archive/20240612/[email protected]/config) compiler: alpha-linux-gcc (GCC) 13.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240612/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All errors (new ones prefixed by >>):
drivers/pinctrl/nuvoton/pinctrl-ma35.c: In function 'ma35_pinctrl_dt_node_to_map_func':
>> drivers/pinctrl/nuvoton/pinctrl-ma35.c:228:28: error: 'struct group_desc' has no member named 'npins'
228 | for (i = 0; i < grp->npins; i++) {
| ^~
drivers/pinctrl/nuvoton/pinctrl-ma35.c: In function 'ma35_pinmux_set_mux':
drivers/pinctrl/nuvoton/pinctrl-ma35.c:287:28: error: 'struct group_desc' has no member named 'npins'
287 | for (i = 0; i < grp->npins; i++) {
| ^~vim +228 drivers/pinctrl/nuvoton/pinctrl-ma35.c
ecc5bf868673446 Jacky Huang 2024-05-21 184
ecc5bf868673446 Jacky Huang 2024-05-21 185 static int ma35_pinctrl_dt_node_to_map_func(struct pinctrl_dev *pctldev,
ecc5bf868673446 Jacky Huang 2024-05-21 186 struct device_node *np,
ecc5bf868673446 Jacky Huang 2024-05-21 187 struct pinctrl_map **map,
ecc5bf868673446 Jacky Huang 2024-05-21 188 unsigned int *num_maps)
ecc5bf868673446 Jacky Huang 2024-05-21 189 {
ecc5bf868673446 Jacky Huang 2024-05-21 190 struct ma35_pinctrl *npctl = pinctrl_dev_get_drvdata(pctldev);
888aa25ee6ce72d Andy Shevchenko 2024-06-11 191 struct ma35_pin_setting *setting;
ecc5bf868673446 Jacky Huang 2024-05-21 192 struct pinctrl_map *new_map;
ecc5bf868673446 Jacky Huang 2024-05-21 193 struct device_node *parent;
888aa25ee6ce72d Andy Shevchenko 2024-06-11 194 struct group_desc *grp;
ecc5bf868673446 Jacky Huang 2024-05-21 195 int map_num = 1;
ecc5bf868673446 Jacky Huang 2024-05-21 196 int i;
ecc5bf868673446 Jacky Huang 2024-05-21 197
ecc5bf868673446 Jacky Huang 2024-05-21 198 /*
ecc5bf868673446 Jacky Huang 2024-05-21 199 * first find the group of this node and check if we need create
ecc5bf868673446 Jacky Huang 2024-05-21 200 * config maps for pins
ecc5bf868673446 Jacky Huang 2024-05-21 201 */
ecc5bf868673446 Jacky Huang 2024-05-21 202 grp = ma35_pinctrl_find_group_by_name(npctl, np->name);
ecc5bf868673446 Jacky Huang 2024-05-21 203 if (!grp) {
ecc5bf868673446 Jacky Huang 2024-05-21 204 dev_err(npctl->dev, "unable to find group for node %s\n", np->name);
ecc5bf868673446 Jacky Huang 2024-05-21 205 return -EINVAL;
ecc5bf868673446 Jacky Huang 2024-05-21 206 }
ecc5bf868673446 Jacky Huang 2024-05-21 207
888aa25ee6ce72d Andy Shevchenko 2024-06-11 208 map_num += grp->grp.npins;
ecc5bf868673446 Jacky Huang 2024-05-21 209 new_map = devm_kcalloc(pctldev->dev, map_num, sizeof(*new_map), GFP_KERNEL);
ecc5bf868673446 Jacky Huang 2024-05-21 210 if (!new_map)
ecc5bf868673446 Jacky Huang 2024-05-21 211 return -ENOMEM;
ecc5bf868673446 Jacky Huang 2024-05-21 212
ecc5bf868673446 Jacky Huang 2024-05-21 213 *map = new_map;
ecc5bf868673446 Jacky Huang 2024-05-21 214 *num_maps = map_num;
ecc5bf868673446 Jacky Huang 2024-05-21 215 /* create mux map */
ecc5bf868673446 Jacky Huang 2024-05-21 216 parent = of_get_parent(np);
ecc5bf868673446 Jacky Huang 2024-05-21 217 if (!parent)
ecc5bf868673446 Jacky Huang 2024-05-21 218 return -EINVAL;
ecc5bf868673446 Jacky Huang 2024-05-21 219
888aa25ee6ce72d Andy Shevchenko 2024-06-11 220 setting = grp->data;
888aa25ee6ce72d Andy Shevchenko 2024-06-11 221
ecc5bf868673446 Jacky Huang 2024-05-21 222 new_map[0].type = PIN_MAP_TYPE_MUX_GROUP;
ecc5bf868673446 Jacky Huang 2024-05-21 223 new_map[0].data.mux.function = parent->name;
ecc5bf868673446 Jacky Huang 2024-05-21 224 new_map[0].data.mux.group = np->name;
ecc5bf868673446 Jacky Huang 2024-05-21 225 of_node_put(parent);
ecc5bf868673446 Jacky Huang 2024-05-21 226
ecc5bf868673446 Jacky Huang 2024-05-21 227 new_map++;
ecc5bf868673446 Jacky Huang 2024-05-21 @228 for (i = 0; i < grp->npins; i++) {
ecc5bf868673446 Jacky Huang 2024-05-21 229 new_map[i].type = PIN_MAP_TYPE_CONFIGS_PIN;
888aa25ee6ce72d Andy Shevchenko 2024-06-11 230 new_map[i].data.configs.group_or_pin = pin_get_name(pctldev, grp->grp.pins[i]);
888aa25ee6ce72d Andy Shevchenko 2024-06-11 231 new_map[i].data.configs.configs = setting[i].configs;
888aa25ee6ce72d Andy Shevchenko 2024-06-11 232 new_map[i].data.configs.num_configs = setting[i].nconfigs;
ecc5bf868673446 Jacky Huang 2024-05-21 233 }
ecc5bf868673446 Jacky Huang 2024-05-21 234 dev_dbg(pctldev->dev, "maps: function %s group %s num %d\n",
ecc5bf868673446 Jacky Huang 2024-05-21 235 (*map)->data.mux.function, (*map)->data.mux.group, map_num);
ecc5bf868673446 Jacky Huang 2024-05-21 236
ecc5bf868673446 Jacky Huang 2024-05-21 237 return 0;
ecc5bf868673446 Jacky Huang 2024-05-21 238 }
ecc5bf868673446 Jacky Huang 2024-05-21 239 Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
PATCH 4/4 pinctrl: nuvoton: Reduce use of OF-specific APIs
In reply to Andy ShevchenkoSome drivers are using device property APIs along with OF-specific ones. At the same time few of the latter can be converted to device property calls. Reduce use of OF-specific APIs in order to bring a bit more consistency into the drivers.
--- drivers/pinctrl/nuvoton/pinctrl-ma35.c | 35 +++++++++++------------ drivers/pinctrl/nuvoton/pinctrl-ma35d1.c | 1 - drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 16 ++--------- drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c | 2 +- 4 files changed, 21 insertions(+), 33 deletions(-)
drivers/pinctrl/nuvoton/pinctrl-ma35.c +17 -18
@@ -519,7 +519,6 @@ static int ma35_gpiolib_register(struct platform_device *pdev, struct ma35_pinct bank->irqtype =0 ; bank->irqinten =0 ; bank->chip.label = bank->name; - bank->chip.of_gpio_n_cells =2 ; bank->chip.parent = &pdev->dev; bank->chip.request = ma35_gpio_core_to_request; bank->chip.direction_input = ma35_gpio_core_direction_in;
@@ -976,9 +975,10 @@ static const struct pinconf_ops ma35_pinconf_ops = { .is_generic = true, }; -static int ma35_pinctrl_parse_groups (struct device_node *np,struct group_desc *grp, +static int ma35_pinctrl_parse_groups (struct fwnode_handle *fwnode,struct group_desc *grp,struct ma35_pinctrl *npctl,u32 index) { +struct device_node *np =to_of_node (fwnode);struct ma35_pin_setting *pin;unsigned long *configs;unsigned int nconfigs;
@@ -990,7 +990,7 @@ static int ma35_pinctrl_parse_groups(struct device_node *np, struct group_desc *if (ret)return ret; - count =of_property_count_elems_of_size (np,"nuvoton,pins" ,sizeof (u32)); + count =fwnode_property_count_u32 (fwnode,"nuvoton,pins" );if (!count || count %3 )return -EINVAL ;
@@ -1000,7 +1000,7 @@ static int ma35_pinctrl_parse_groups(struct device_node *np, struct group_desc * grp->grp.name = np->name; - ret =of_property_read_u32_array (np,"nuvoton,pins" , elems, count); + ret =fwnode_property_read_u32_array (fwnode,"nuvoton,pins" , elems, count);if (ret)return -EINVAL ; grp->grp.npins = count /3 ;
@@ -1027,10 +1027,11 @@ static int ma35_pinctrl_parse_groups(struct device_node *np, struct group_desc *return 0 ; } -static int ma35_pinctrl_parse_functions (struct device_node *np,struct ma35_pinctrl *npctl, +static int ma35_pinctrl_parse_functions (struct fwnode_handle *fwnode,struct ma35_pinctrl *npctl,u32 index) { -struct device_node *child; +struct device_node *np =to_of_node (fwnode); +struct fwnode_handle *child;struct pinfunction *func;struct group_desc *grp;static u32 grp_index;
@@ -1050,12 +1051,14 @@ static int ma35_pinctrl_parse_functions(struct device_node *np, struct ma35_pincif (!groups)return -ENOMEM ; -for_each_child_of_node (np, child) { - groups[i] = child->name; +fwnode_for_each_child_node (fwnode, child) { +struct device_node *node =to_of_node (child); + + groups[i] = node->name; grp = &npctl->groups[grp_index++]; ret =ma35_pinctrl_parse_groups (child, grp, npctl, i++);if (ret) { -of_node_put (child); +fwnode_handle_put (child);return ret; } }
@@ -1066,13 +1069,12 @@ static int ma35_pinctrl_parse_functions(struct device_node *np, struct ma35_pincstatic int ma35_pinctrl_probe_dt (struct platform_device *pdev,struct ma35_pinctrl *npctl) { +struct device *dev = &pdev->dev;struct fwnode_handle *child;u32 idx =0 ;int ret; -device_for_each_child_node (&pdev->dev, child) { -if (fwnode_property_present (child,"gpio-controller" )) -continue ; +for_each_gpiochip_node (dev, child) { npctl->nfunctions++; npctl->ngroups +=of_get_child_count (to_of_node (child)); }
@@ -1090,11 +1092,8 @@ static int ma35_pinctrl_probe_dt(struct platform_device *pdev, struct ma35_pinctif (!npctl->groups)return -ENOMEM ; -device_for_each_child_node (&pdev->dev, child) { -if (fwnode_property_present (child,"gpio-controller" )) -continue ; - - ret =ma35_pinctrl_parse_functions (to_of_node (child), npctl, idx++); +for_each_gpiochip_node (dev, child) { + ret =ma35_pinctrl_parse_functions (child, npctl, idx++);if (ret) {fwnode_handle_put (child);dev_err (&pdev->dev,"failed to parse function\n" );
@@ -1139,7 +1138,7 @@ int ma35_pinctrl_probe(struct platform_device *pdev, const struct ma35_pinctrl_s npctl->info = info; npctl->dev = &pdev->dev; - npctl->regmap =syscon_regmap_lookup_by_phandle (pdev->dev.of_node,"nuvoton,sys" ); + npctl->regmap =syscon_regmap_lookup_by_phandle (dev_of_node (dev),"nuvoton,sys" );if (IS_ERR (npctl->regmap))return dev_err_probe (&pdev->dev,PTR_ERR (npctl->regmap),"No syscfg phandle specified\n" );
drivers/pinctrl/nuvoton/pinctrl-ma35d1.c +0 -1
@@ -9,7 +9,6 @@#include <linux/io.h> #include <linux/mod_devicetable.h> #include <linux/module.h> -#include <linux/of.h> #include <linux/platform_device.h> #include <linux/pm.h>
drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c +3 -13
@@ -7,10 +7,8 @@#include <linux/interrupt.h> #include <linux/irq.h> #include <linux/mfd/syscon.h> +#include <linux/mod_devicetable.h> #include <linux/module.h> -#include <linux/of.h> -#include <linux/of_address.h> -#include <linux/of_irq.h> #include <linux/platform_device.h> #include <linux/property.h> #include <linux/regmap.h>
@@ -1839,15 +1837,7 @@ static int npcm7xx_gpio_of(struct npcm7xx_pinctrl *pctrl)int id =0 ;for_each_gpiochip_node (dev, child) { -struct device_node *np =to_of_node (child); - - ret =of_address_to_resource (np,0 , &res); -if (ret <0 ) { -dev_err (dev,"Resource fail for GPIO bank %u\n" , id); -return ret; - } - - pctrl->gpio_bank[id].base =ioremap (res.start,resource_size (&res)); + pctrl->gpio_bank[id].base =fwnode_iomap (child,0 );if (!pctrl->gpio_bank[id].base)return -EINVAL ;
@@ -1869,7 +1859,7 @@ static int npcm7xx_gpio_of(struct npcm7xx_pinctrl *pctrl)return ret; } - ret =irq_of_parse_and_map (np,0 ); + ret =fwnode_irq_get (child,0 );if (!ret) {dev_err (dev,"No IRQ for GPIO bank %u\n" , id);return -EINVAL ;
drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c +1 -1
@@ -2421,7 +2421,7 @@ static int npcm8xx_pinctrl_probe(struct platform_device *pdev)platform_set_drvdata (pdev, pctrl); pctrl->gcr_regmap = -syscon_regmap_lookup_by_phandle (dev->of_node,"nuvoton,sysgcr" ); +syscon_regmap_lookup_by_phandle (dev_of_node (dev),"nuvoton,sysgcr" );if (IS_ERR (pctrl->gcr_regmap))return dev_err_probe (dev,PTR_ERR (pctrl->gcr_regmap),"Failed to find nuvoton,sysgcr property\n" );
Signature · 1 line
2.45.2
kernel test robot
build botRe: [PATCH v1 4/4] pinctrl: nuvoton: Reduce use of OF-specific APIs
kernel test robot noticed the following build warnings:
Hi Andy,
kernel test robot noticed the following build warnings:
[auto build test WARNING on linusw-pinctrl/devel]
[also build test WARNING on linusw-pinctrl/for-next next-20240611] [cannot apply to linus/master v6.10-rc3]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Andy-Shevchenko/pinctrl-nuvoton-Convert-to-use-struct-pingroup-and-PINCTRL_PINGROUP/20240611-173545 base: https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git devel patch link: https://lore.kernel.org/r/20240611093127.90210-5-andy.shevchenko%40gmail.com patch subject: [PATCH v1 4/4] pinctrl: nuvoton: Reduce use of OF-specific APIs config: alpha-allyesconfig (https://download.01.org/0day-ci/archive/20240612/[email protected]/config) compiler: alpha-linux-gcc (GCC) 13.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240612/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All warnings (new ones prefixed by >>):
drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c: In function 'npcm7xx_gpio_of':
>> drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c:1833:25: warning: unused variable 'res' [-Wunused-variable]
1833 | struct resource res;
| ^~~vim +/res +1833 drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c
3b588e43ee5c7a Tomer Maimon 2018-08-08 1829
3b588e43ee5c7a Tomer Maimon 2018-08-08 1830 static int npcm7xx_gpio_of(struct npcm7xx_pinctrl *pctrl)
3b588e43ee5c7a Tomer Maimon 2018-08-08 1831 {
3b588e43ee5c7a Tomer Maimon 2018-08-08 1832 int ret = -ENXIO;
3b588e43ee5c7a Tomer Maimon 2018-08-08 @1833 struct resource res;
0173ce55e50800 Andy Shevchenko 2022-04-01 1834 struct device *dev = pctrl->dev;
0173ce55e50800 Andy Shevchenko 2022-04-01 1835 struct fwnode_reference_args args;
0173ce55e50800 Andy Shevchenko 2022-04-01 1836 struct fwnode_handle *child;
0173ce55e50800 Andy Shevchenko 2022-04-01 1837 int id = 0;
0173ce55e50800 Andy Shevchenko 2022-04-01 1838
0173ce55e50800 Andy Shevchenko 2022-04-01 1839 for_each_gpiochip_node(dev, child) {
7123707f39ae24 Andy Shevchenko 2024-06-11 1840 pctrl->gpio_bank[id].base = fwnode_iomap(child, 0);
ad64639417161e Jiasheng Jiang 2023-06-07 1841 if (!pctrl->gpio_bank[id].base)
ad64639417161e Jiasheng Jiang 2023-06-07 1842 return -EINVAL;
3b588e43ee5c7a Tomer Maimon 2018-08-08 1843
0173ce55e50800 Andy Shevchenko 2022-04-01 1844 ret = bgpio_init(&pctrl->gpio_bank[id].gc, dev, 4,
0173ce55e50800 Andy Shevchenko 2022-04-01 1845 pctrl->gpio_bank[id].base + NPCM7XX_GP_N_DIN,
0173ce55e50800 Andy Shevchenko 2022-04-01 1846 pctrl->gpio_bank[id].base + NPCM7XX_GP_N_DOUT,
3b588e43ee5c7a Tomer Maimon 2018-08-08 1847 NULL,
3b588e43ee5c7a Tomer Maimon 2018-08-08 1848 NULL,
0173ce55e50800 Andy Shevchenko 2022-04-01 1849 pctrl->gpio_bank[id].base + NPCM7XX_GP_N_IEM,
3b588e43ee5c7a Tomer Maimon 2018-08-08 1850 BGPIOF_READ_OUTPUT_REG_SET);
3b588e43ee5c7a Tomer Maimon 2018-08-08 1851 if (ret) {
0173ce55e50800 Andy Shevchenko 2022-04-01 1852 dev_err(dev, "bgpio_init() failed\n");
3b588e43ee5c7a Tomer Maimon 2018-08-08 1853 return ret;
3b588e43ee5c7a Tomer Maimon 2018-08-08 1854 }
3b588e43ee5c7a Tomer Maimon 2018-08-08 1855
0173ce55e50800 Andy Shevchenko 2022-04-01 1856 ret = fwnode_property_get_reference_args(child, "gpio-ranges", NULL, 3, 0, &args);
3b588e43ee5c7a Tomer Maimon 2018-08-08 1857 if (ret < 0) {
0173ce55e50800 Andy Shevchenko 2022-04-01 1858 dev_err(dev, "gpio-ranges fail for GPIO bank %u\n", id);
3b588e43ee5c7a Tomer Maimon 2018-08-08 1859 return ret;
3b588e43ee5c7a Tomer Maimon 2018-08-08 1860 }
3b588e43ee5c7a Tomer Maimon 2018-08-08 1861
7123707f39ae24 Andy Shevchenko 2024-06-11 1862 ret = fwnode_irq_get(child, 0);
e804944dcc7799 Krzysztof Kozlowski 2022-04-23 1863 if (!ret) {
0173ce55e50800 Andy Shevchenko 2022-04-01 1864 dev_err(dev, "No IRQ for GPIO bank %u\n", id);
e804944dcc7799 Krzysztof Kozlowski 2022-04-23 1865 return -EINVAL;
0173ce55e50800 Andy Shevchenko 2022-04-01 1866 }
0173ce55e50800 Andy Shevchenko 2022-04-01 1867 pctrl->gpio_bank[id].irq = ret;
0173ce55e50800 Andy Shevchenko 2022-04-01 1868 pctrl->gpio_bank[id].irqbase = id * NPCM7XX_GPIO_PER_BANK;
0173ce55e50800 Andy Shevchenko 2022-04-01 1869 pctrl->gpio_bank[id].pinctrl_id = args.args[0];
0173ce55e50800 Andy Shevchenko 2022-04-01 1870 pctrl->gpio_bank[id].gc.base = args.args[1];
0173ce55e50800 Andy Shevchenko 2022-04-01 1871 pctrl->gpio_bank[id].gc.ngpio = args.args[2];
3b588e43ee5c7a Tomer Maimon 2018-08-08 1872 pctrl->gpio_bank[id].gc.owner = THIS_MODULE;
0173ce55e50800 Andy Shevchenko 2022-04-01 1873 pctrl->gpio_bank[id].gc.parent = dev;
0173ce55e50800 Andy Shevchenko 2022-04-01 1874 pctrl->gpio_bank[id].gc.fwnode = child;
0173ce55e50800 Andy Shevchenko 2022-04-01 1875 pctrl->gpio_bank[id].gc.label = devm_kasprintf(dev, GFP_KERNEL, "%pfw", child);
4be1eaf322f07b Nicholas Mc Guire 2018-11-23 1876 if (pctrl->gpio_bank[id].gc.label == NULL)
4be1eaf322f07b Nicholas Mc Guire 2018-11-23 1877 return -ENOMEM;
4be1eaf322f07b Nicholas Mc Guire 2018-11-23 1878
3b588e43ee5c7a Tomer Maimon 2018-08-08 1879 pctrl->gpio_bank[id].gc.dbg_show = npcmgpio_dbg_show;
0173ce55e50800 Andy Shevchenko 2022-04-01 1880 pctrl->gpio_bank[id].direction_input = pctrl->gpio_bank[id].gc.direction_input;
0173ce55e50800 Andy Shevchenko 2022-04-01 1881 pctrl->gpio_bank[id].gc.direction_input = npcmgpio_direction_input;
0173ce55e50800 Andy Shevchenko 2022-04-01 1882 pctrl->gpio_bank[id].direction_output = pctrl->gpio_bank[id].gc.direction_output;
0173ce55e50800 Andy Shevchenko 2022-04-01 1883 pctrl->gpio_bank[id].gc.direction_output = npcmgpio_direction_output;
0173ce55e50800 Andy Shevchenko 2022-04-01 1884 pctrl->gpio_bank[id].request = pctrl->gpio_bank[id].gc.request;
3b588e43ee5c7a Tomer Maimon 2018-08-08 1885 pctrl->gpio_bank[id].gc.request = npcmgpio_gpio_request;
de38bdbe011b31 Bartosz Golaszewski 2023-10-13 1886 pctrl->gpio_bank[id].gc.free = pinctrl_gpio_free;
3b588e43ee5c7a Tomer Maimon 2018-08-08 1887 id++;
3b588e43ee5c7a Tomer Maimon 2018-08-08 1888 }
3b588e43ee5c7a Tomer Maimon 2018-08-08 1889
3b588e43ee5c7a Tomer Maimon 2018-08-08 1890 pctrl->bank_num = id;
3b588e43ee5c7a Tomer Maimon 2018-08-08 1891 return ret;
3b588e43ee5c7a Tomer Maimon 2018-08-08 1892 }
3b588e43ee5c7a Tomer Maimon 2018-08-08 1893 Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki