pinctrl: core: Remove unused members from struct group_desc

All drivers are converted to use embedded struct pingroup.
Remove unused members from struct group_desc.

Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20231211190321.307330-14-andriy.shevchenko@linux.intel.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c
index 8a457b512706efbfb3fbe55d45f8ee1d3eb4fcc0..d27d5a04b1a8c5b548be6ab87f9a1e8742668900 100644 (file)
--- a/drivers/pinctrl/core.c
+++ b/drivers/pinctrl/core.c
@@ -557,9 +557,6 @@ const char *pinctrl_generic_get_group_name(struct pinctrl_dev *pctldev,
        if (!group)
                return NULL;
 
-       if (group->name)
-               return group->name;
-
        return group->grp.name;
 }
 EXPORT_SYMBOL_GPL(pinctrl_generic_get_group_name);
@@ -586,12 +583,6 @@ int pinctrl_generic_get_group_pins(struct pinctrl_dev *pctldev,
                return -EINVAL;
        }
 
-       if (group->pins) {
-               *pins = group->pins;
-               *num_pins = group->num_pins;
-               return 0;
-       }
-
        *pins = group->grp.pins;
        *num_pins = group->grp.npins;
 

diff --git a/drivers/pinctrl/core.h b/drivers/pinctrl/core.h
index a3b75ec7b54b48a8f9ef8334e621016c6aec5b80..837fd5bd903df811dd0731917d43f7f8bc906e4f 100644 (file)
--- a/drivers/pinctrl/core.h
+++ b/drivers/pinctrl/core.h
@@ -199,16 +199,10 @@ struct pinctrl_maps {
 /**
  * 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 unsigned int *pins;
-       int num_pins;
        void *data;
 };
 
@@ -216,9 +210,6 @@ struct group_desc {
 #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,                                  \
        .data = _data,                                          \
 }