[PATCH 1/4] serial: imx: Remove unneeded '#ifdef CONFIG_OF'

Fabio Estevam fabio.estevam at freescale.com
Fri Jun 15 13:23:04 EDT 2012


CONFIG_OF is always selected for imx SoCs so it is safe
to drop the '#ifdef CONFIG_OF'.

Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
Cc: Alan Cox <alan at linux.intel.com>
Cc: <linux-serial at vger.kernel.org>
Signed-off-by: Fabio Estevam <fabio.estevam at freescale.com>
---
 drivers/tty/serial/imx.c |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
index 0af4eec..4bfa95d 100644
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@ -1399,7 +1399,6 @@ static int serial_imx_resume(struct platform_device *dev)
 	return 0;
 }
 
-#ifdef CONFIG_OF
 /*
  * This function returns 1 iff pdev isn't a device instatiated by dt, 0 iff it
  * could successfully get all information from dt or a negative errno.
@@ -1433,13 +1432,6 @@ static int serial_imx_probe_dt(struct imx_port *sport,
 
 	return 0;
 }
-#else
-static inline int serial_imx_probe_dt(struct imx_port *sport,
-		struct platform_device *pdev)
-{
-	return 1;
-}
-#endif
 
 static void serial_imx_probe_pdata(struct imx_port *sport,
 		struct platform_device *pdev)
-- 
1.7.1





More information about the linux-arm-kernel mailing list