Message ID | 20180615111141.37184-2-tony@atomide.com |
---|---|
State | New |
Headers | show |
Series | pinctrl fixes for generic functions and groups | expand |
On Fri, Jun 15, 2018 at 2:14 PM Tony Lindgren <tony@atomide.com> wrote: > > We must return the selector from pinctrl_generic_add_group() so > pin controller device drivers can remove the right group if needed > for deferred probe for example. > > Note that fixes are also needed for the pin controller drivers to > use the selector value. > > Fixes: c7059c5ac70a ("pinctrl: core: Add generic pinctrl functions > for managing groups") > Reported-by: H. Nikolaus Schaller <hns@goldelico.com> > Cc: Haojian Zhuang <haojian.zhuang@linaro.org> > Cc: Jacopo Mondi <jacopo+renesas@jmondi.org> > Cc: Paul Cercueil <paul@crapouillou.net> > Cc: Sean Wang <sean.wang@mediatek.com> > Signed-off-by: Tony Lindgren <tony@atomide.com> > --- > drivers/pinctrl/core.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c > --- a/drivers/pinctrl/core.c > +++ b/drivers/pinctrl/core.c > @@ -631,6 +631,7 @@ int pinctrl_generic_add_group(struct pinctrl_dev *pctldev, const char *name, > int *pins, int num_pins, void *data) > { > struct group_desc *group; > + int selector = pctldev->num_groups; > > group = devm_kzalloc(pctldev->dev, sizeof(*group), GFP_KERNEL); > if (!group) > @@ -641,12 +642,12 @@ int pinctrl_generic_add_group(struct pinctrl_dev *pctldev, const char *name, > group->num_pins = num_pins; > group->data = data; > > - radix_tree_insert(&pctldev->pin_group_tree, pctldev->num_groups, > + radix_tree_insert(&pctldev->pin_group_tree, selector, > group); A nit: Can it be now one line? > > pctldev->num_groups++; > > - return 0; > + return selector; > } > EXPORT_SYMBOL_GPL(pinctrl_generic_add_group); > > -- > 2.17.1
* Andy Shevchenko <andy.shevchenko@gmail.com> [180617 16:53]: > On Fri, Jun 15, 2018 at 2:14 PM Tony Lindgren <tony@atomide.com> wrote: > > @@ -641,12 +642,12 @@ int pinctrl_generic_add_group(struct pinctrl_dev *pctldev, const char *name, > > group->num_pins = num_pins; > > group->data = data; > > > > - radix_tree_insert(&pctldev->pin_group_tree, pctldev->num_groups, > > + radix_tree_insert(&pctldev->pin_group_tree, selector, > > group); > > A nit: Can it be now one line? Sure will update and post an updated series of patches. It probably makes sense to wait a bit with these as there are still issues remaining for deferred probe. Regards, Tony -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c --- a/drivers/pinctrl/core.c +++ b/drivers/pinctrl/core.c @@ -631,6 +631,7 @@ int pinctrl_generic_add_group(struct pinctrl_dev *pctldev, const char *name, int *pins, int num_pins, void *data) { struct group_desc *group; + int selector = pctldev->num_groups; group = devm_kzalloc(pctldev->dev, sizeof(*group), GFP_KERNEL); if (!group) @@ -641,12 +642,12 @@ int pinctrl_generic_add_group(struct pinctrl_dev *pctldev, const char *name, group->num_pins = num_pins; group->data = data; - radix_tree_insert(&pctldev->pin_group_tree, pctldev->num_groups, + radix_tree_insert(&pctldev->pin_group_tree, selector, group); pctldev->num_groups++; - return 0; + return selector; } EXPORT_SYMBOL_GPL(pinctrl_generic_add_group);
We must return the selector from pinctrl_generic_add_group() so pin controller device drivers can remove the right group if needed for deferred probe for example. Note that fixes are also needed for the pin controller drivers to use the selector value. Fixes: c7059c5ac70a ("pinctrl: core: Add generic pinctrl functions for managing groups") Reported-by: H. Nikolaus Schaller <hns@goldelico.com> Cc: Haojian Zhuang <haojian.zhuang@linaro.org> Cc: Jacopo Mondi <jacopo+renesas@jmondi.org> Cc: Paul Cercueil <paul@crapouillou.net> Cc: Sean Wang <sean.wang@mediatek.com> Signed-off-by: Tony Lindgren <tony@atomide.com> --- drivers/pinctrl/core.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)