Merge tag 'gcc-plugins-v4.9-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git...

[cascardo/linux.git] / drivers / memory / atmel-ebi.c

diff --git a/drivers/memory/atmel-ebi.c b/drivers/memory/atmel-ebi.c
index f87ad6f..b5ed3bd 100644 (file)
--- a/drivers/memory/atmel-ebi.c
+++ b/drivers/memory/atmel-ebi.c
@@ -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,