pinctrl: mediatek: moore: Convert to use func member

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>

diff --git a/drivers/pinctrl/mediatek/pinctrl-moore.c b/drivers/pinctrl/mediatek/pinctrl-moore.c
index d972584c0519b7324cc560b85b81b2e4c9e6f60d..aad4891223d3e060431a990bfabb6bd2cbb82087 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-moore.c
+++ b/drivers/pinctrl/mediatek/pinctrl-moore.c
@@ -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);

diff --git a/drivers/pinctrl/mediatek/pinctrl-moore.h b/drivers/pinctrl/mediatek/pinctrl-moore.h
index 5945e4fe021f7e4bf1cd2e958214432354a00bc6..229d19561e229c77714e5fccb3d4fb68eacc77fd 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-moore.h
+++ b/drivers/pinctrl/mediatek/pinctrl-moore.h
@@ -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,                                                                   \
        }