Patchwork Input: replace IS_ERR and PTR_ERR with PTR_ERR_OR_ZERO

login
register
mail settings
Submitter Duan Jiong
Date Nov. 6, 2013, 7:54 a.m.
Message ID <1383724472-15475-1-git-send-email-duanj.fnst@cn.fujitsu.com>
Download mbox | patch
Permalink /patch/288754/
State New
Headers show

Comments

Duan Jiong - Nov. 6, 2013, 7:54 a.m.
This patch fixes coccinelle error regarding usage of IS_ERR and
PTR_ERR instead of PTR_ERR_OR_ZERO.

Signed-off-by: Duan Jiong <duanj.fnst@cn.fujitsu.com>
---
 drivers/input/touchscreen/cyttsp4_spi.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
Dmitry Torokhov - Nov. 11, 2013, 7:42 a.m.
On Wed, Nov 06, 2013 at 03:54:32PM +0800, Duan Jiong wrote:
> This patch fixes coccinelle error regarding usage of IS_ERR and
> PTR_ERR instead of PTR_ERR_OR_ZERO.
> 
> Signed-off-by: Duan Jiong <duanj.fnst@cn.fujitsu.com>

Applied, thank you.

> ---
>  drivers/input/touchscreen/cyttsp4_spi.c | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/drivers/input/touchscreen/cyttsp4_spi.c b/drivers/input/touchscreen/cyttsp4_spi.c
> index a71e114..b19434c 100644
> --- a/drivers/input/touchscreen/cyttsp4_spi.c
> +++ b/drivers/input/touchscreen/cyttsp4_spi.c
> @@ -171,10 +171,7 @@ static int cyttsp4_spi_probe(struct spi_device *spi)
>  	ts = cyttsp4_probe(&cyttsp_spi_bus_ops, &spi->dev, spi->irq,
>  			  CY_SPI_DATA_BUF_SIZE);
>  
> -	if (IS_ERR(ts))
> -		return PTR_ERR(ts);
> -
> -	return 0;
> +	return PTR_ERR_OR_ZERO(ts);
>  }
>  
>  static int cyttsp4_spi_remove(struct spi_device *spi)
> -- 
> 1.8.3.1
>

Patch

diff --git a/drivers/input/touchscreen/cyttsp4_spi.c b/drivers/input/touchscreen/cyttsp4_spi.c
index a71e114..b19434c 100644
--- a/drivers/input/touchscreen/cyttsp4_spi.c
+++ b/drivers/input/touchscreen/cyttsp4_spi.c
@@ -171,10 +171,7 @@  static int cyttsp4_spi_probe(struct spi_device *spi)
 	ts = cyttsp4_probe(&cyttsp_spi_bus_ops, &spi->dev, spi->irq,
 			  CY_SPI_DATA_BUF_SIZE);
 
-	if (IS_ERR(ts))
-		return PTR_ERR(ts);
-
-	return 0;
+	return PTR_ERR_OR_ZERO(ts);
 }
 
 static int cyttsp4_spi_remove(struct spi_device *spi)