Thread (16 messages) flat view 16 messages, 3 authors, 2011-01-27
DORMANTno replies

[PATCH 09/13] ARM i.MX51 mx51 3ds: remove unnecessary CONFIG_SERIAL_IMX ifdefs

From: Sergei Shtylyov <hidden>
Date: 2011-01-27 13:26:32

Hello.

On 27-01-2011 16:00, Sascha Hauer wrote:
Signed-off-by: Sascha Hauer<s.hauer@pengutronix.de>
---
  arch/arm/mach-mx5/board-mx51_3ds.c |   14 ++++----------
  1 files changed, 4 insertions(+), 10 deletions(-)
quoted hunk ↗ jump to hunk
diff --git a/arch/arm/mach-mx5/board-mx51_3ds.c b/arch/arm/mach-mx5/board-mx51_3ds.c
index 8a0619b..feb2800 100644
--- a/arch/arm/mach-mx5/board-mx51_3ds.c
+++ b/arch/arm/mach-mx5/board-mx51_3ds.c
@@ -71,22 +71,13 @@ static iomux_v3_cfg_t mx51_3ds_pads[] = {
  };

  /* Serial ports */
-#if defined(CONFIG_SERIAL_IMX) || defined(CONFIG_SERIAL_IMX_MODULE)
  static const struct imxuart_platform_data uart_pdata __initconst = {
  	.flags = IMXUART_HAVE_RTSCTS,
  };

  static inline void mxc_init_imx_uart(void)
  {
-	imx51_add_imx_uart(0, &uart_pdata);
-	imx51_add_imx_uart(1, &uart_pdata);
-	imx51_add_imx_uart(2, &uart_pdata);
-}
-#else /* !SERIAL_IMX */
-static inline void mxc_init_imx_uart(void)
-{
  }
    Why then leave the empty function?
quoted hunk ↗ jump to hunk
-#endif /* SERIAL_IMX */

  #if defined(CONFIG_KEYBOARD_IMX) || defined(CONFIG_KEYBOARD_IMX_MODULE)
  static int mx51_3ds_board_keymap[] = {
@@ -161,7 +152,10 @@ static void __init mxc_board_init(void)
  {
  	mxc_iomux_v3_setup_multiple_pads(mx51_3ds_pads,
  					ARRAY_SIZE(mx51_3ds_pads));
-	mxc_init_imx_uart();
+
+	imx51_add_imx_uart(0, &uart_pdata);
+	imx51_add_imx_uart(1, &uart_pdata);
+	imx51_add_imx_uart(2, &uart_pdata);

  	imx51_add_ecspi(1,&mx51_3ds_ecspi2_pdata);
  	spi_register_board_info(mx51_3ds_spi_nor_device,
WBR, Sergei
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help