From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Sasha Levin To: "stable@vger.kernel.org" , "linux-kernel@vger.kernel.org" CC: Tony Lindgren , Christ van Willegen , Haojian Zhuang , Jacopo Mondi , Paul Cercueil , Sean Wang , Linus Walleij , Sasha Levin Subject: [PATCH AUTOSEL 4.14 16/57] pinctrl: pinmux: Return selector to the pinctrl driver Date: Sat, 15 Sep 2018 01:32:39 +0000 Message-ID: <20180915013223.179909-16-alexander.levin@microsoft.com> References: <20180915013223.179909-1-alexander.levin@microsoft.com> In-Reply-To: <20180915013223.179909-1-alexander.levin@microsoft.com> Content-Language: en-US Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: From: Tony Lindgren [ Upstream commit f913cfce4ee49a3382a9ff95696f49a46e56e974 ] We must return the selector from pinmux_generic_add_function() so pin controller device drivers can remove the right group if needed for deferred probe for example. And we now must make sure that a proper name is passed so we can use it to check if the entry already exists. Note that fixes are also needed for the pin controller drivers to use the selector value. Fixes: a76edc89b100 ("pinctrl: core: Add generic pinctrl functions for managing groups") Reported-by: H. Nikolaus Schaller Cc: Christ van Willegen Cc: Haojian Zhuang Cc: Jacopo Mondi Cc: Paul Cercueil Cc: Sean Wang Signed-off-by: Tony Lindgren Tested-By: H. Nikolaus Schaller Reviewed-by: Andy Shevchenko Signed-off-by: Linus Walleij Signed-off-by: Sasha Levin --- drivers/pinctrl/pinmux.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/pinctrl/pinmux.c b/drivers/pinctrl/pinmux.c index 55502fc4479c..ec41ed209380 100644 --- a/drivers/pinctrl/pinmux.c +++ b/drivers/pinctrl/pinmux.c @@ -308,7 +308,6 @@ static int pinmux_func_name_to_selector(struct pinctrl_= dev *pctldev, selector++; } =20 - dev_err(pctldev->dev, "function '%s' not supported\n", function); return -EINVAL; } =20 @@ -777,6 +776,16 @@ int pinmux_generic_add_function(struct pinctrl_dev *pc= tldev, void *data) { struct function_desc *function; + int selector; + + if (!name) + return -EINVAL; + + selector =3D pinmux_func_name_to_selector(pctldev, name); + if (selector >=3D 0) + return selector; + + selector =3D pctldev->num_functions; =20 function =3D devm_kzalloc(pctldev->dev, sizeof(*function), GFP_KERNEL); if (!function) @@ -787,12 +796,11 @@ int pinmux_generic_add_function(struct pinctrl_dev *p= ctldev, function->num_group_names =3D num_groups; function->data =3D data; =20 - radix_tree_insert(&pctldev->pin_function_tree, pctldev->num_functions, - function); + radix_tree_insert(&pctldev->pin_function_tree, selector, function); =20 pctldev->num_functions++; =20 - return 0; + return selector; } EXPORT_SYMBOL_GPL(pinmux_generic_add_function); =20 --=20 2.17.1