iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pinctrl: intel: Make use of struct pinfunction and PINCTRL_PINFUNCTION()

Browse Source 
Since pin control provides a generic data type and a macro for
the pin function definition, use them in the Intel driver.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
This commit is contained in:
Andy Shevchenko 2022-12-19 14:42:34 +02:00
parent 443a0a0f0c
commit 999b85bfd7
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/pinctrl/intel/pinctrl-intel.c
View File

@ -372,7 +372,7 @@ static const char *intel_get_function_name(struct pinctrl_dev *pctldev,
{ {
struct intel_pinctrl *pctrl = pinctrl_dev_get_drvdata(pctldev); struct intel_pinctrl *pctrl = pinctrl_dev_get_drvdata(pctldev);
return pctrl->soc->functions[function].name; return pctrl->soc->functions[function].func.name;
} }
static int intel_get_function_groups(struct pinctrl_dev *pctldev, static int intel_get_function_groups(struct pinctrl_dev *pctldev,
@ -382,8 +382,8 @@ static int intel_get_function_groups(struct pinctrl_dev *pctldev,
{ {
struct intel_pinctrl *pctrl = pinctrl_dev_get_drvdata(pctldev); struct intel_pinctrl *pctrl = pinctrl_dev_get_drvdata(pctldev);
*groups = pctrl->soc->functions[function].groups; *groups = pctrl->soc->functions[function].func.groups;
*ngroups = pctrl->soc->functions[function].ngroups; *ngroups = pctrl->soc->functions[function].func.ngroups;
return 0; return 0;
} }

3
drivers/pinctrl/intel/pinctrl-intel.h
View File

@ -36,11 +36,13 @@ struct intel_pingroup {
/** /**
* struct intel_function - Description about a function * struct intel_function - Description about a function
* @func: Generic data of the pin function (name and groups of pins)
* @name: Name of the function * @name: Name of the function
* @groups: An array of groups for this function * @groups: An array of groups for this function
* @ngroups: Number of groups in @groups * @ngroups: Number of groups in @groups
*/ */
struct intel_function { struct intel_function {
struct pinfunction func;
const char *name; const char *name;
const char * const *groups; const char * const *groups;
size_t ngroups; size_t ngroups;
@ -185,6 +187,7 @@ struct intel_community {
#define FUNCTION(n, g) \ #define FUNCTION(n, g) \
{ \ { \
.func = PINCTRL_PINFUNCTION((n), (g), ARRAY_SIZE(g)), \
.name = (n), \ .name = (n), \
.groups = (g), \ .groups = (g), \
.ngroups = ARRAY_SIZE((g)), \ .ngroups = ARRAY_SIZE((g)), \