diff mbox

[03/18] Input: cyttsp - use PTR_ERR_OR_ZERO()

Message ID 1443793229-22363-4-git-send-email-javier@osg.samsung.com (mailing list archive)
State Accepted
Headers show

Commit Message

Javier Martinez Canillas Oct. 2, 2015, 1:40 p.m. UTC
The PTR_ERR_OR_ZERO() helper function checks if a pointer contains an
errno code and returns it or return 0 if that's not the case. Use the
helper instead of open coding the same logic in the driver. This was
found with make coccicheck that complains with the following warning:

drivers/input/touchscreen/cyttsp4_i2c.c:53:1-3: WARNING: PTR_ERR_OR_ZERO can be used

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
---

 drivers/input/touchscreen/cyttsp4_i2c.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

Comments

Dmitry Torokhov Oct. 2, 2015, 6:21 p.m. UTC | #1
On Fri, Oct 02, 2015 at 03:40:14PM +0200, Javier Martinez Canillas wrote:
> The PTR_ERR_OR_ZERO() helper function checks if a pointer contains an
> errno code and returns it or return 0 if that's not the case. Use the
> helper instead of open coding the same logic in the driver. This was
> found with make coccicheck that complains with the following warning:
> 
> drivers/input/touchscreen/cyttsp4_i2c.c:53:1-3: WARNING: PTR_ERR_OR_ZERO can be used
> 
> Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>

Applied, thank you.

> ---
> 
>  drivers/input/touchscreen/cyttsp4_i2c.c | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/drivers/input/touchscreen/cyttsp4_i2c.c b/drivers/input/touchscreen/cyttsp4_i2c.c
> index a9f95c7d3c00..564e49002d5d 100644
> --- a/drivers/input/touchscreen/cyttsp4_i2c.c
> +++ b/drivers/input/touchscreen/cyttsp4_i2c.c
> @@ -50,10 +50,7 @@ static int cyttsp4_i2c_probe(struct i2c_client *client,
>  	ts = cyttsp4_probe(&cyttsp4_i2c_bus_ops, &client->dev, client->irq,
>  			  CYTTSP4_I2C_DATA_SIZE);
>  
> -	if (IS_ERR(ts))
> -		return PTR_ERR(ts);
> -
> -	return 0;
> +	return PTR_ERR_OR_ZERO(ts);
>  }
>  
>  static int cyttsp4_i2c_remove(struct i2c_client *client)
> -- 
> 2.4.3
>
diff mbox

Patch

diff --git a/drivers/input/touchscreen/cyttsp4_i2c.c b/drivers/input/touchscreen/cyttsp4_i2c.c
index a9f95c7d3c00..564e49002d5d 100644
--- a/drivers/input/touchscreen/cyttsp4_i2c.c
+++ b/drivers/input/touchscreen/cyttsp4_i2c.c
@@ -50,10 +50,7 @@  static int cyttsp4_i2c_probe(struct i2c_client *client,
 	ts = cyttsp4_probe(&cyttsp4_i2c_bus_ops, &client->dev, client->irq,
 			  CYTTSP4_I2C_DATA_SIZE);
 
-	if (IS_ERR(ts))
-		return PTR_ERR(ts);
-
-	return 0;
+	return PTR_ERR_OR_ZERO(ts);
 }
 
 static int cyttsp4_i2c_remove(struct i2c_client *client)