pinctrl: baytrail: 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-baytrail.c b/drivers/pinctrl/intel/pinctrl-baytrail.c
index 67db79f..770a272 100644 (file)
--- a/drivers/pinctrl/intel/pinctrl-baytrail.c
+++ b/drivers/pinctrl/intel/pinctrl-baytrail.c
@@ -637,18 +637,18 @@ static const char *byt_get_function_name(struct pinctrl_dev *pctldev,
 {
        struct intel_pinctrl *vg = pinctrl_dev_get_drvdata(pctldev);
 
-       return vg->soc->functions[selector].name;
+       return vg->soc->functions[selector].func.name;
 }
 
 static int byt_get_function_groups(struct pinctrl_dev *pctldev,
                                   unsigned int selector,
                                   const char * const **groups,
-                                  unsigned int *num_groups)
+                                  unsigned int *ngroups)
 {
        struct intel_pinctrl *vg = pinctrl_dev_get_drvdata(pctldev);
 
-       *groups         = vg->soc->functions[selector].groups;
-       *num_groups     = vg->soc->functions[selector].ngroups;
+       *groups         = vg->soc->functions[selector].func.groups;
+       *ngroups        = vg->soc->functions[selector].func.ngroups;
 
        return 0;
 }
@@ -722,7 +722,7 @@ static int byt_set_mux(struct pinctrl_dev *pctldev, unsigned int func_selector,
 
        if (group.modes)
                byt_set_group_mixed_mux(vg, group, group.modes);
-       else if (!strcmp(func.name, "gpio"))
+       else if (!strcmp(func.func.name, "gpio"))
                byt_set_group_simple_mux(vg, group, BYT_DEFAULT_GPIO_MUX);
        else
                byt_set_group_simple_mux(vg, group, group.mode);