diff mbox

pcmcia: at91_cf: Use PTR_ERR_OR_ZERO()

Message ID 1511882500-7285-1-git-send-email-gomonovych@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Vasyl Gomonovych Nov. 28, 2017, 3:21 p.m. UTC
Fix ptr_ret.cocci warnings:
drivers/pcmcia/at91_cf.c:239:1-3: WARNING: PTR_ERR_OR_ZERO can be used

Use PTR_ERR_OR_ZERO rather than if(IS_ERR(...)) + PTR_ERR

Generated by: scripts/coccinelle/api/ptr_ret.cocci

Signed-off-by: Vasyl Gomonovych <gomonovych@gmail.com>
---
 drivers/pcmcia/at91_cf.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Comments

Nicolas Ferre Nov. 28, 2017, 3:41 p.m. UTC | #1
On 28/11/2017 at 16:21, Vasyl Gomonovych wrote:
> Fix ptr_ret.cocci warnings:
> drivers/pcmcia/at91_cf.c:239:1-3: WARNING: PTR_ERR_OR_ZERO can be used
> 
> Use PTR_ERR_OR_ZERO rather than if(IS_ERR(...)) + PTR_ERR
> 
> Generated by: scripts/coccinelle/api/ptr_ret.cocci
> 
> Signed-off-by: Vasyl Gomonovych <gomonovych@gmail.com>

okay...
Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com>

> ---
>  drivers/pcmcia/at91_cf.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/drivers/pcmcia/at91_cf.c b/drivers/pcmcia/at91_cf.c
> index 87147bcd1655..7da7b0f0ae1b 100644
> --- a/drivers/pcmcia/at91_cf.c
> +++ b/drivers/pcmcia/at91_cf.c
> @@ -236,10 +236,8 @@ static int at91_cf_dt_init(struct platform_device *pdev)
>  	pdev->dev.platform_data = board;
>  
>  	mc = syscon_regmap_lookup_by_compatible("atmel,at91rm9200-sdramc");
> -	if (IS_ERR(mc))
> -		return PTR_ERR(mc);
>  
> -	return 0;
> +	return PTR_ERR_OR_ZERO(mc);
>  }
>  #else
>  static int at91_cf_dt_init(struct platform_device *pdev)
>
Alexandre Belloni Nov. 29, 2017, 8:59 p.m. UTC | #2
On 28/11/2017 at 16:21:40 +0100, Vasyl Gomonovych wrote:
> Fix ptr_ret.cocci warnings:
> drivers/pcmcia/at91_cf.c:239:1-3: WARNING: PTR_ERR_OR_ZERO can be used
> 
> Use PTR_ERR_OR_ZERO rather than if(IS_ERR(...)) + PTR_ERR
> 
> Generated by: scripts/coccinelle/api/ptr_ret.cocci
> 
> Signed-off-by: Vasyl Gomonovych <gomonovych@gmail.com>
> ---
>  drivers/pcmcia/at91_cf.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
Applied, thanks.
diff mbox

Patch

diff --git a/drivers/pcmcia/at91_cf.c b/drivers/pcmcia/at91_cf.c
index 87147bcd1655..7da7b0f0ae1b 100644
--- a/drivers/pcmcia/at91_cf.c
+++ b/drivers/pcmcia/at91_cf.c
@@ -236,10 +236,8 @@  static int at91_cf_dt_init(struct platform_device *pdev)
 	pdev->dev.platform_data = board;
 
 	mc = syscon_regmap_lookup_by_compatible("atmel,at91rm9200-sdramc");
-	if (IS_ERR(mc))
-		return PTR_ERR(mc);
 
-	return 0;
+	return PTR_ERR_OR_ZERO(mc);
 }
 #else
 static int at91_cf_dt_init(struct platform_device *pdev)