pinctrl: lynxpoint: 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-lynxpoint.c b/drivers/pinctrl/intel/pinctrl-lynxpoint.c
index 8d05dad38556cdff98493807a5ef0c7a6197b310..cdace55aaeac8163cc3004b386c42f6469886c11 100644 (file)
--- a/drivers/pinctrl/intel/pinctrl-lynxpoint.c
+++ b/drivers/pinctrl/intel/pinctrl-lynxpoint.c
@@ -341,18 +341,18 @@ static const char *lp_get_function_name(struct pinctrl_dev *pctldev,
 {
        struct intel_pinctrl *lg = pinctrl_dev_get_drvdata(pctldev);
 
-       return lg->soc->functions[selector].name;
+       return lg->soc->functions[selector].func.name;
 }
 
 static int lp_get_function_groups(struct pinctrl_dev *pctldev,
                                  unsigned int selector,
                                  const char * const **groups,
-                                 unsigned int *num_groups)
+                                 unsigned int *ngroups)
 {
        struct intel_pinctrl *lg = pinctrl_dev_get_drvdata(pctldev);
 
-       *groups         = lg->soc->functions[selector].groups;
-       *num_groups     = lg->soc->functions[selector].ngroups;
+       *groups         = lg->soc->functions[selector].func.groups;
+       *ngroups        = lg->soc->functions[selector].func.ngroups;
 
        return 0;
 }