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

Subsystems: the rest, tty layer and serial drivers

STALE5197d

5 messages, 2 authors, 2012-06-15 · open the first message on its own page

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

From: Fabio Estevam <hidden>
Date: 2012-06-15 17:23:04 

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

Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Alan Cox <redacted>
Cc: <redacted>
Signed-off-by: Fabio Estevam <redacted>
---
 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

[PATCH 2/4] mmc: sdhci-esdhc-imx: Remove unneeded '#ifdef CONFIG_OF'

From: Fabio Estevam <hidden>
Date: 2012-06-15 17:23:05 

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

Cc: Chris Ball <redacted>
Cc: <redacted>
Signed-off-by: Fabio Estevam <redacted>
---
 drivers/mmc/host/sdhci-esdhc-imx.c |    9 ---------
 1 files changed, 0 insertions(+), 9 deletions(-)

diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
index ebbe984..1b0c999 100644
--- a/drivers/mmc/host/sdhci-esdhc-imx.c
+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
@@ -397,7 +397,6 @@ static irqreturn_t cd_irq(int irq, void *data)
 	return IRQ_HANDLED;
 };
 
-#ifdef CONFIG_OF
 static int __devinit
 sdhci_esdhc_imx_probe_dt(struct platform_device *pdev,
 			 struct esdhc_platform_data *boarddata)
@@ -426,14 +425,6 @@ sdhci_esdhc_imx_probe_dt(struct platform_device *pdev,
 
 	return 0;
 }
-#else
-static inline int
-sdhci_esdhc_imx_probe_dt(struct platform_device *pdev,
-			 struct esdhc_platform_data *boarddata)
-{
-	return -ENODEV;
-}
-#endif
 
 static int __devinit sdhci_esdhc_imx_probe(struct platform_device *pdev)
 {
-- 
1.7.1

[PATCH 3/4] ARM: clk-imx27: Remove unneeded '#ifdef CONFIG_OF'

From: Fabio Estevam <hidden>
Date: 2012-06-15 17:23:06 

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

Signed-off-by: Fabio Estevam <redacted>
---
 arch/arm/mach-imx/clk-imx27.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-imx/clk-imx27.c b/arch/arm/mach-imx/clk-imx27.c
index 295cbd7..e73c05f 100644
--- a/arch/arm/mach-imx/clk-imx27.c
+++ b/arch/arm/mach-imx/clk-imx27.c
@@ -270,7 +270,6 @@ int __init mx27_clocks_init(unsigned long fref)
 	return 0;
 }
 
-#ifdef CONFIG_OF
 int __init mx27_clocks_init_dt(void)
 {
 	struct device_node *np;
@@ -286,4 +285,3 @@ int __init mx27_clocks_init_dt(void)
 
 	return mx27_clocks_init(fref);
 }
-#endif
-- 
1.7.1

[PATCH 4/4] ARM: clk-imx51-imx53: Remove unneeded '#ifdef CONFIG_OF'

From: Fabio Estevam <hidden>
Date: 2012-06-15 17:23:07 

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

Signed-off-by: Fabio Estevam <redacted>
---
 arch/arm/mach-imx/clk-imx51-imx53.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-imx/clk-imx51-imx53.c b/arch/arm/mach-imx/clk-imx51-imx53.c
index 20964ce..59e3f9a 100644
--- a/arch/arm/mach-imx/clk-imx51-imx53.c
+++ b/arch/arm/mach-imx/clk-imx51-imx53.c
@@ -465,7 +465,6 @@ int __init mx53_clocks_init(unsigned long rate_ckil, unsigned long rate_osc,
 	return 0;
 }
 
-#ifdef CONFIG_OF
 static void __init clk_get_freq_dt(unsigned long *ckil, unsigned long *osc,
 				   unsigned long *ckih1, unsigned long *ckih2)
 {
@@ -503,4 +502,3 @@ int __init mx53_clocks_init_dt(void)
 	clk_get_freq_dt(&ckil, &osc, &ckih1, &ckih2);
 	return mx53_clocks_init(ckil, osc, ckih1, ckih2);
 }
-#endif
-- 
1.7.1

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

From: festevam@gmail.com (Fabio Estevam)
Date: 2012-06-15 18:33:33 

On Fri, Jun 15, 2012 at 2:23 PM, Fabio Estevam
[off-list ref] wrote:
CONFIG_OF is always selected for imx SoCs so it is safe
to drop the '#ifdef CONFIG_OF'.

Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Alan Cox <redacted>
Cc: <redacted>
Signed-off-by: Fabio Estevam <redacted>
Please discard this series.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help