Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 06:01:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

pinctrl: ingenic: Convert to use func member

Browse Source 
Convert drivers to use func member embedded in struct function_desc,
because other members will be removed to avoid duplication and
desynchronisation of the generic pin function description.

Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Link: https://lore.kernel.org/r/20240530085745.1539925-9-andy.shevchenko@gmail.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Andy Shevchenko 2024-05-30 11:55:17 +03:00 committed by Linus Walleij
parent f3e0473aa8
commit be9e92afd3
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/pinctrl/pinctrl-ingenic.c
View File

@ -96,9 +96,7 @@
#define INGENIC_PIN_FUNCTION(_name_, id) \
{ \
.name = _name_, \
.group_names = id##_groups, \
.num_group_names = ARRAY_SIZE(id##_groups), \
.func = PINCTRL_PINFUNCTION(_name_, id##_groups, ARRAY_SIZE(id##_groups)), \
.data = NULL, \
}
@ -3769,7 +3767,7 @@ 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->grp.name);
func->func.name, grp->grp.name);
mode = (uintptr_t)grp->data;
if (mode <= 3) {
@ -4317,14 +4315,14 @@ static int __init ingenic_pinctrl_probe(struct platform_device *pdev)
}
for (i = 0; i < chip_info->num_functions; i++) {
const struct function_desc *func = &chip_info->functions[i];
const struct function_desc *function = &chip_info->functions[i];
const struct pinfunction *func = &function->func;
err = pinmux_generic_add_function(jzpc->pctl, func->name,
func->group_names, func->num_group_names,
func->data);
func->groups, func->ngroups,
function->data);
if (err < 0) {
dev_err(dev, "Failed to register function %s\n",
func->name);
dev_err(dev, "Failed to register function %s\n", func->name);
return err;
}
}