diff mbox series

[-next] pinctrl/spear: simplify the return expression of spear300_pinctrl_probe()

Message ID 20201210135746.1492-1-zhengyongjun3@huawei.com (mailing list archive)
State New, archived
Headers show
Series [-next] pinctrl/spear: simplify the return expression of spear300_pinctrl_probe() | expand

Commit Message

Zheng Yongjun Dec. 10, 2020, 1:57 p.m. UTC
Simplify the return expression.

Signed-off-by: Zheng Yongjun <zhengyongjun3@huawei.com>
---
 drivers/pinctrl/spear/pinctrl-spear300.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

Comments

Viresh Kumar Dec. 10, 2020, 3:59 p.m. UTC | #1
On 10-12-20, 21:57, Zheng Yongjun wrote:
> Simplify the return expression.
> 
> Signed-off-by: Zheng Yongjun <zhengyongjun3@huawei.com>
> ---
>  drivers/pinctrl/spear/pinctrl-spear300.c | 8 +-------
>  1 file changed, 1 insertion(+), 7 deletions(-)
> 
> diff --git a/drivers/pinctrl/spear/pinctrl-spear300.c b/drivers/pinctrl/spear/pinctrl-spear300.c
> index e39913a18139..d53a04597cbe 100644
> --- a/drivers/pinctrl/spear/pinctrl-spear300.c
> +++ b/drivers/pinctrl/spear/pinctrl-spear300.c
> @@ -654,8 +654,6 @@ static const struct of_device_id spear300_pinctrl_of_match[] = {
>  
>  static int spear300_pinctrl_probe(struct platform_device *pdev)
>  {
> -	int ret;
> -
>  	spear3xx_machdata.groups = spear300_pingroups;
>  	spear3xx_machdata.ngroups = ARRAY_SIZE(spear300_pingroups);
>  	spear3xx_machdata.functions = spear300_functions;
> @@ -669,11 +667,7 @@ static int spear300_pinctrl_probe(struct platform_device *pdev)
>  
>  	pmx_init_addr(&spear3xx_machdata, PMX_CONFIG_REG);
>  
> -	ret = spear_pinctrl_probe(pdev, &spear3xx_machdata);
> -	if (ret)
> -		return ret;
> -
> -	return 0;
> +	return spear_pinctrl_probe(pdev, &spear3xx_machdata);
>  }
>  
>  static struct platform_driver spear300_pinctrl_driver = {

Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Linus Walleij Dec. 12, 2020, 12:42 a.m. UTC | #2
On Thu, Dec 10, 2020 at 2:57 PM Zheng Yongjun <zhengyongjun3@huawei.com> wrote:

> Simplify the return expression.
>
> Signed-off-by: Zheng Yongjun <zhengyongjun3@huawei.com>

Patch applied.

Yours,
Linus Walleij
diff mbox series

Patch

diff --git a/drivers/pinctrl/spear/pinctrl-spear300.c b/drivers/pinctrl/spear/pinctrl-spear300.c
index e39913a18139..d53a04597cbe 100644
--- a/drivers/pinctrl/spear/pinctrl-spear300.c
+++ b/drivers/pinctrl/spear/pinctrl-spear300.c
@@ -654,8 +654,6 @@  static const struct of_device_id spear300_pinctrl_of_match[] = {
 
 static int spear300_pinctrl_probe(struct platform_device *pdev)
 {
-	int ret;
-
 	spear3xx_machdata.groups = spear300_pingroups;
 	spear3xx_machdata.ngroups = ARRAY_SIZE(spear300_pingroups);
 	spear3xx_machdata.functions = spear300_functions;
@@ -669,11 +667,7 @@  static int spear300_pinctrl_probe(struct platform_device *pdev)
 
 	pmx_init_addr(&spear3xx_machdata, PMX_CONFIG_REG);
 
-	ret = spear_pinctrl_probe(pdev, &spear3xx_machdata);
-	if (ret)
-		return ret;
-
-	return 0;
+	return spear_pinctrl_probe(pdev, &spear3xx_machdata);
 }
 
 static struct platform_driver spear300_pinctrl_driver = {