Merge tag 'at91-ab-4.16-drivers' of git://git.kernel.org/pub/scm/linu…

…x/kernel/git/abelloni/linux into next/drivers drivers for 4.16 - use PTR_ERR_OR_ZERO were relevant in at91_cf * tag 'at91-ab-4.16-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: pcmcia: at91_cf: Use PTR_ERR_OR_ZERO() Signed-off-by: Olof Johansson <[email protected]>
thoughtpolice · Jan 5, 2018 · 57e3615 · 57e3615
2 parents 11077e9 + 1203839
commit 57e3615
Showing 1 changed file with 1 addition and 3 deletions.
diff --git 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)