pinctrl: merrifield: Convert to use new memeber in struct intel_function

Convert driver to use generic data type and hence a new member in
the struct intel_function. No functional change intended.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>

diff --git a/drivers/pinctrl/intel/pinctrl-merrifield.c b/drivers/pinctrl/intel/pinctrl-merrifield.c
index c0845bb1e9e361bb0e5654168aa32ba6b21c7833..365c391c97a3fb012e3e8cef77de0a1670de9398 100644 (file)
--- a/drivers/pinctrl/intel/pinctrl-merrifield.c
+++ b/drivers/pinctrl/intel/pinctrl-merrifield.c
@@ -576,7 +576,7 @@ static const char *mrfld_get_function_name(struct pinctrl_dev *pctldev,
 {
        struct mrfld_pinctrl *mp = pinctrl_dev_get_drvdata(pctldev);
 
-       return mp->functions[function].name;
+       return mp->functions[function].func.name;
 }
 
 static int mrfld_get_function_groups(struct pinctrl_dev *pctldev,
@@ -586,8 +586,8 @@ static int mrfld_get_function_groups(struct pinctrl_dev *pctldev,
 {
        struct mrfld_pinctrl *mp = pinctrl_dev_get_drvdata(pctldev);
 
-       *groups = mp->functions[function].groups;
-       *ngroups = mp->functions[function].ngroups;
+       *groups = mp->functions[function].func.groups;
+       *ngroups = mp->functions[function].func.ngroups;
        return 0;
 }