Commit de82e6f0 authored by Andy Shevchenko's avatar Andy Shevchenko
Browse files

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: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
parent b19d82e1

drivers/pinctrl/intel/pinctrl-merrifield.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

}