kevin/linux
1
Fork 0
Code

pinctrl: mediatek: moore: 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.

Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Link: https://lore.kernel.org/r/20240530085745.1539925-11-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:19 +03:00 committed by Linus Walleij
parent ab8866c5d3
commit 6273a1b1ce
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/pinctrl/mediatek/pinctrl-moore.c
View File

@ -56,7 +56,7 @@ static int mtk_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);
for (i = 0; i < grp->grp.npins; i++) {
const struct mtk_pin_desc *desc;
@ -620,12 +620,12 @@ static int mtk_build_functions(struct mtk_pinctrl *hw)
int i, err;
for (i = 0; i < hw->soc->nfuncs ; i++) {
const struct function_desc *func = hw->soc->funcs + i;
const struct function_desc *function = hw->soc->funcs + i;
const struct pinfunction *func = &function->func;
err = pinmux_generic_add_function(hw->pctrl, func->name,
func->group_names,
func->num_group_names,
func->data);
func->groups, func->ngroups,
function->data);
if (err < 0) {
dev_err(hw->dev, "Failed to register function %s\n",
func->name);

4
drivers/pinctrl/mediatek/pinctrl-moore.h
View File

@ -45,9 +45,7 @@
#define PINCTRL_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, \
}