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

pinctrl: pinmux: Add a convenient define PINCTRL_FUNCTION_DESC()

Browse Source 
Add PINCTRL_FUNCTION_DESC() macro for inline use.

While at it, fix adjective form in the comment of PINCTRL_GROUP_DESC().

Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Link: https://lore.kernel.org/r/20240530085745.1539925-6-andy.shevchenko@gmail.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Andy Shevchenko 2024-05-30 11:55:14 +03:00 committed by Linus Walleij
parent dc02d925dc
commit f26945d76a
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/pinctrl/core.h
View File

@ -206,7 +206,7 @@ struct group_desc {
void *data; void *data;
}; };
/* Convenience macro to define a generic pin group descriptor */ /* Convenient macro to define a generic pin group descriptor */
#define PINCTRL_GROUP_DESC(_name, _pins, _num_pins, _data) \ #define PINCTRL_GROUP_DESC(_name, _pins, _num_pins, _data) \
(struct group_desc) { \ (struct group_desc) { \
.grp = PINCTRL_PINGROUP(_name, _pins, _num_pins), \ .grp = PINCTRL_PINGROUP(_name, _pins, _num_pins), \

9
drivers/pinctrl/pinmux.c
View File

@ -852,13 +852,13 @@ EXPORT_SYMBOL_GPL(pinmux_generic_get_function);
* @pctldev: pin controller device * @pctldev: pin controller device
* @name: name of the function * @name: name of the function
* @groups: array of pin groups * @groups: array of pin groups
* @num_groups: number of pin groups * @ngroups: number of pin groups
* @data: pin controller driver specific data * @data: pin controller driver specific data
*/ */
int pinmux_generic_add_function(struct pinctrl_dev *pctldev, int pinmux_generic_add_function(struct pinctrl_dev *pctldev,
const char *name, const char *name,
const char * const *groups, const char * const *groups,
const unsigned int num_groups, const unsigned int ngroups,
void *data) void *data)
{ {
struct function_desc *function; struct function_desc *function;
@ -877,10 +877,7 @@ int pinmux_generic_add_function(struct pinctrl_dev *pctldev,
if (!function) if (!function)
return -ENOMEM; return -ENOMEM;
function->name = name; *function = PINCTRL_FUNCTION_DESC(name, groups, ngroups, data);
function->group_names = groups;
function->num_group_names = num_groups;
function->data = data;
error = radix_tree_insert(&pctldev->pin_function_tree, selector, function); error = radix_tree_insert(&pctldev->pin_function_tree, selector, function);
if (error) if (error)

11
drivers/pinctrl/pinmux.h
View File

@ -145,6 +145,15 @@ struct function_desc {
void *data; void *data;
}; };
/* Convenient macro to define a generic pin function descriptor */
#define PINCTRL_FUNCTION_DESC(_name, _grps, _num_grps, _data) \
(struct function_desc) { \
.name = _name, \
.group_names = _grps, \
.num_group_names = _num_grps, \
.data = _data, \
}
int pinmux_generic_get_function_count(struct pinctrl_dev *pctldev); int pinmux_generic_get_function_count(struct pinctrl_dev *pctldev);
const char * const char *
@ -162,7 +171,7 @@ struct function_desc *pinmux_generic_get_function(struct pinctrl_dev *pctldev,
int pinmux_generic_add_function(struct pinctrl_dev *pctldev, int pinmux_generic_add_function(struct pinctrl_dev *pctldev,
const char *name, const char *name,
const char * const *groups, const char * const *groups,
unsigned int const num_groups, unsigned int const ngroups,
void *data); void *data);
int pinmux_generic_remove_function(struct pinctrl_dev *pctldev, int pinmux_generic_remove_function(struct pinctrl_dev *pctldev,