2014-10-16 16:22:32

by Fengguang Wu

[permalink] [raw]
Subject: [PATCH] spi/atmel: fix simple_return.cocci warnings

drivers/spi/spi-atmel.c:1518:1-4: WARNING: end returns can be simpified and declaration on line 1514 can be dropped

Simplify a trivial if-return sequence. Possibly combine with a
preceding function call.
Generated by: scripts/coccinelle/misc/simple_return.cocci

CC: Wenyou Yang <[email protected]>
Signed-off-by: Fengguang Wu <[email protected]>
---

Please take the patch only if it's a positive warning. Thanks!

spi-atmel.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)

--- a/drivers/spi/spi-atmel.c
+++ b/drivers/spi/spi-atmel.c
@@ -1511,15 +1511,10 @@ static int atmel_spi_runtime_resume(stru
{
struct spi_master *master = dev_get_drvdata(dev);
struct atmel_spi *as = spi_master_get_devdata(master);
- int ret;

pinctrl_pm_select_default_state(dev);

- ret = clk_prepare_enable(as->clk);
- if (ret)
- return ret;
-
- return 0;
+ return clk_prepare_enable(as->clk);
}
#endif


2014-10-17 08:58:34

by Mark Brown

[permalink] [raw]
Subject: Re: [PATCH] spi/atmel: fix simple_return.cocci warnings

On Fri, Oct 17, 2014 at 12:18:56AM +0800, Fengguang Wu wrote:
> drivers/spi/spi-atmel.c:1518:1-4: WARNING: end returns can be simpified and declaration on line 1514 can be dropped

Applied, thanks.


Attachments:
(No filename) (198.00 B)
signature.asc (473.00 B)
Digital signature
Download all attachments

2014-10-17 09:05:54

by Nicolas Ferre

[permalink] [raw]
Subject: Re: [PATCH] spi/atmel: fix simple_return.cocci warnings

On 16/10/2014 18:18, Fengguang Wu :
> drivers/spi/spi-atmel.c:1518:1-4: WARNING: end returns can be simpified and declaration on line 1514 can be dropped
>
> Simplify a trivial if-return sequence. Possibly combine with a
> preceding function call.
> Generated by: scripts/coccinelle/misc/simple_return.cocci
>
> CC: Wenyou Yang <[email protected]>
> Signed-off-by: Fengguang Wu <[email protected]>
> ---
>
> Please take the patch only if it's a positive warning. Thanks!
>
> spi-atmel.c | 7 +------
> 1 file changed, 1 insertion(+), 6 deletions(-)
>
> --- a/drivers/spi/spi-atmel.c
> +++ b/drivers/spi/spi-atmel.c
> @@ -1511,15 +1511,10 @@ static int atmel_spi_runtime_resume(stru
> {
> struct spi_master *master = dev_get_drvdata(dev);
> struct atmel_spi *as = spi_master_get_devdata(master);
> - int ret;
>
> pinctrl_pm_select_default_state(dev);
>
> - ret = clk_prepare_enable(as->clk);
> - if (ret)
> - return ret;
> -
> - return 0;
> + return clk_prepare_enable(as->clk);

Indeed:

Acked-by: Nicolas Ferre <[email protected]>

> }
> #endif
>
> --
> To unsubscribe from this list: send the line "unsubscribe devicetree" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>


--
Nicolas Ferre