From: Ezequiel Garcia Date: Mon, 12 Aug 2013 17:14:46 +0000 (-0300) Subject: mtd: nand: pxa3xx: Remove unneeded ifdef CONFIG_OF X-Git-Tag: next-20130822~69^2~44 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6d2ce746f6239219a3fdf9e6a46089565fa6df9d;p=karo-tx-linux.git mtd: nand: pxa3xx: Remove unneeded ifdef CONFIG_OF There's no need to enclose this code within idef CONFIG_OF, because the OF framework provides no-op stubs if CONFIG_OF=n. Cc: devicetree@vger.kernel.org Signed-off-by: Ezequiel Garcia Signed-off-by: Brian Norris --- diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c index 501e380211e0..02f214d486fb 100644 --- a/drivers/mtd/nand/pxa3xx_nand.c +++ b/drivers/mtd/nand/pxa3xx_nand.c @@ -1190,7 +1190,6 @@ static int pxa3xx_nand_remove(struct platform_device *pdev) return 0; } -#ifdef CONFIG_OF static struct of_device_id pxa3xx_nand_dt_ids[] = { { .compatible = "marvell,pxa3xx-nand" }, {} @@ -1221,12 +1220,6 @@ static int pxa3xx_nand_probe_dt(struct platform_device *pdev) return 0; } -#else -static inline int pxa3xx_nand_probe_dt(struct platform_device *pdev) -{ - return 0; -} -#endif static int pxa3xx_nand_probe(struct platform_device *pdev) {