lkml.org 
[lkml]   [2023]   [Nov]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 13/22] pinctrl: core: Embed struct pingroup into struct group_desc
    Date
    struct group_desc is a particular version of the struct pingroup
    with associated opaque data. Start switching pin control core and
    drivers to use it explicitly.

    Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
    ---
    drivers/pinctrl/core.c | 15 ++++++++++++---
    drivers/pinctrl/core.h | 5 +++++
    2 files changed, 17 insertions(+), 3 deletions(-)

    diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c
    index 3f1fd50fbb10..e08d4b3b0a56 100644
    --- a/drivers/pinctrl/core.c
    +++ b/drivers/pinctrl/core.c
    @@ -559,7 +559,10 @@ const char *pinctrl_generic_get_group_name(struct pinctrl_dev *pctldev,
    if (!group)
    return NULL;

    - return group->name;
    + if (group->name)
    + return group->name;
    +
    + return group->grp.name;
    }
    EXPORT_SYMBOL_GPL(pinctrl_generic_get_group_name);

    @@ -585,8 +588,14 @@ int pinctrl_generic_get_group_pins(struct pinctrl_dev *pctldev,
    return -EINVAL;
    }

    - *pins = group->pins;
    - *num_pins = group->num_pins;
    + if (group->pins) {
    + *pins = group->pins;
    + *num_pins = group->num_pins;
    + return 0;
    + }
    +
    + *pins = group->grp.pins;
    + *num_pins = group->grp.npins;

    return 0;
    }
    diff --git a/drivers/pinctrl/core.h b/drivers/pinctrl/core.h
    index 276a631fd49c..863b4956a41e 100644
    --- a/drivers/pinctrl/core.h
    +++ b/drivers/pinctrl/core.h
    @@ -194,14 +194,18 @@ struct pinctrl_maps {

    #ifdef CONFIG_GENERIC_PINCTRL_GROUPS

    +#include <linux/pinctrl/pinctrl.h>
    +
    /**
    * struct group_desc - generic pin group descriptor
    + * @grp: generic data of the pin group (name and pins)
    * @name: name of the pin group
    * @pins: array of pins that belong to the group
    * @num_pins: number of pins in the group
    * @data: pin controller driver specific data
    */
    struct group_desc {
    + struct pingroup grp;
    const char *name;
    const int *pins;
    int num_pins;
    @@ -211,6 +215,7 @@ struct group_desc {
    /* Convenience macro to define a generic pin group descriptor */
    #define PINCTRL_GROUP_DESC(_name, _pins, _num_pins, _data) \
    (struct group_desc) { \
    + .grp = PINCTRL_PINGROUP(_name, _pins, _num_pins), \
    .name = _name, \
    .pins = _pins, \
    .num_pins = _num_pins, \
    --
    2.43.0.rc1.1.gbec44491f096
    \
     
     \ /
      Last update: 2023-11-28 21:06    [W:3.257 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site