memory: atmel-ebi: use PTR_ERR_OR_ZERO() to simplify the code
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>
Thu, 7 Jul 2016 02:08:38 +0000 (02:08 +0000)
committerAlexandre Belloni <alexandre.belloni@free-electrons.com>
Mon, 8 Aug 2016 10:12:29 +0000 (12:12 +0200)
Use PTR_ERR_OR_ZERO rather than if(IS_ERR(...)) + PTR_ERR.

Generated by coccinelle.

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
drivers/memory/atmel-ebi.c

index f87ad6f5d2dcce8e6620cbfe9bc5c55469e4ffde..b5ed3bd082b5464a2c443ba58f48b6bf0b39acf7 100644 (file)
@@ -410,10 +410,7 @@ static int at91sam9_ebi_init(struct at91_ebi *ebi)
 
        field.reg = AT91SAM9_SMC_MODE(AT91SAM9_SMC_GENERIC);
        fields->mode = devm_regmap_field_alloc(ebi->dev, ebi->smc, field);
-       if (IS_ERR(fields->mode))
-               return PTR_ERR(fields->mode);
-
-       return 0;
+       return PTR_ERR_OR_ZERO(fields->mode);
 }
 
 static int sama5d3_ebi_init(struct at91_ebi *ebi)
@@ -441,10 +438,7 @@ static int sama5d3_ebi_init(struct at91_ebi *ebi)
 
        field.reg = SAMA5_SMC_MODE(SAMA5_SMC_GENERIC);
        fields->mode = devm_regmap_field_alloc(ebi->dev, ebi->smc, field);
-       if (IS_ERR(fields->mode))
-               return PTR_ERR(fields->mode);
-
-       return 0;
+       return PTR_ERR_OR_ZERO(fields->mode);
 }
 
 static int at91_ebi_dev_setup(struct at91_ebi *ebi, struct device_node *np,