Skip to contentSkip to conversation

mx25: generic.c: Fix coding style

PATCH New Fabio Estevam 2 participants 15 messages Oct 5, 2011

Subsystems (2)
Arm (32-bit) Arm i.MX and Layerscape
lore
Share & tools
lore

Fabio Estevam

author reviewer
#0 lore raw

PATCH v2 1/2 mx25: generic.c: Fix coding style

Running checkpatch on arch/arm/cpu/arm926ejs/mx25/generic.c we get:

total: 2 errors, 59 warnings, 326 lines checked

Fix these errors and warnings.

Signed-off-by Fabio Estevam <[email protected]>

---
Changes since v1:
- Fixed typo on subject

 arch/arm/cpu/arm926ejs/mx25/generic.c |  110 ++++++++++++++++----------------
 1 files changed, 55 insertions(+), 55 deletions(-)
arch/arm/cpu/arm926ejs/mx25/generic.c +55 -55
index 8e60a26..c045a0b 100644
@@ -39,7 +39,7 @@
  *  f = 2 * f_ref * --------------------
  *                        pd + 1
  */
-static unsigned int imx_decode_pll (unsigned int pll, unsigned int f_ref)
+static unsigned int imx_decode_pll(unsigned int pll, unsigned int f_ref)
 {
 	unsigned int mfi = (pll >> CCM_PLL_MFI_SHIFT)
 	    & CCM_PLL_MFI_MASK;

@@ -52,57 +52,57 @@ static unsigned int imx_decode_pll (unsigned int pll, unsigned int f_ref)
 
 	mfi = mfi <= 5 ? 5 : mfi;
 
-	return lldiv (2 * (u64) f_ref * (mfi * (mfd + 1) + mfn),
+	return lldiv(2 * (u64) f_ref * (mfi * (mfd + 1) + mfn),
 		      (mfd + 1) * (pd + 1));
 }
 
-static ulong imx_get_mpllclk (void)
+static ulong imx_get_mpllclk(void)
 {
 	struct ccm_regs *ccm = (struct ccm_regs *)IMX_CCM_BASE;
 	ulong fref = 24000000;
 
-	return imx_decode_pll (readl (&ccm->mpctl), fref);
+	return imx_decode_pll(readl(&ccm->mpctl), fref);
 }
 
-ulong imx_get_armclk (void)
+ulong imx_get_armclk(void)
 {
 	struct ccm_regs *ccm = (struct ccm_regs *)IMX_CCM_BASE;
-	ulong cctl = readl (&ccm->cctl);
-	ulong fref = imx_get_mpllclk ();
+	ulong cctl = readl(&ccm->cctl);
+	ulong fref = imx_get_mpllclk();
 	ulong div;
 
 	if (cctl & CCM_CCTL_ARM_SRC)
-		fref = lldiv ((fref * 3), 4);
+		fref = lldiv((fref * 3), 4);
 
 	div = ((cctl >> CCM_CCTL_ARM_DIV_SHIFT)
 	       & CCM_CCTL_ARM_DIV_MASK) + 1;
 
-	return lldiv (fref, div);
+	return lldiv(fref, div);
 }
 
-ulong imx_get_ahbclk (void)
+ulong imx_get_ahbclk(void)
 {
 	struct ccm_regs *ccm = (struct ccm_regs *)IMX_CCM_BASE;
-	ulong cctl = readl (&ccm->cctl);
-	ulong fref = imx_get_armclk ();
+	ulong cctl = readl(&ccm->cctl);
+	ulong fref = imx_get_armclk();
 	ulong div;
 
 	div = ((cctl >> CCM_CCTL_AHB_DIV_SHIFT)
 	       & CCM_CCTL_AHB_DIV_MASK) + 1;
 
-	return lldiv (fref, div);
+	return lldiv(fref, div);
 }
 
-ulong imx_get_perclk (int clk)
+ulong imx_get_perclk(int clk)
 {
 	struct ccm_regs *ccm = (struct ccm_regs *)IMX_CCM_BASE;
-	ulong fref = imx_get_ahbclk ();
+	ulong fref = imx_get_ahbclk();
 	ulong div;
 
-	div = readl (&ccm->pcdr[CCM_PERCLK_REG (clk)]);
-	div = ((div >> CCM_PERCLK_SHIFT (clk)) & CCM_PERCLK_MASK) + 1;
+	div = readl(&ccm->pcdr[CCM_PERCLK_REG(clk)]);
+	div = ((div >> CCM_PERCLK_SHIFT(clk)) & CCM_PERCLK_MASK) + 1;
 
-	return lldiv (fref, div);
+	return lldiv(fref, div);
 }
 
 u32 get_cpu_rev(void)

@@ -153,7 +153,7 @@ static char *get_reset_cause(void)
 
 }
 
-int print_cpuinfo (void)
+int print_cpuinfo(void)
 {
 	char buf[32];
 	u32 cpurev = get_cpu_rev();

@@ -161,22 +161,22 @@ int print_cpuinfo (void)
 	printf("CPU:   Freescale i.MX25 rev%d.%d%s at %s MHz\n",
 		(cpurev & 0xF0) >> 4, (cpurev & 0x0F),
 		((cpurev & 0x8000) ? " unknown" : ""),
-		strmhz (buf, imx_get_armclk ()));
+		strmhz(buf, imx_get_armclk()));
 	printf("Reset cause: %s\n\n", get_reset_cause());
 	return 0;
 }
 #endif
 
-int cpu_eth_init (bd_t * bis)
+int cpu_eth_init(bd_t *bis)
 {
 #if defined(CONFIG_FEC_MXC)
 	struct ccm_regs *ccm = (struct ccm_regs *)IMX_CCM_BASE;
 	ulong val;
 
-	val = readl (&ccm->cgr0);
+	val = readl(&ccm->cgr0);
 	val |= (1 << 23);
-	writel (val, &ccm->cgr0);
-	return fecmxc_initialize (bis);
+	writel(val, &ccm->cgr0);
+	return fecmxc_initialize(bis);
 #else
 	return 0;
 #endif

@@ -186,10 +186,10 @@ int cpu_eth_init (bd_t * bis)
  * Initializes on-chip MMC controllers.
  * to override, implement board_mmc_init()
  */
-int cpu_mmc_init (bd_t * bis)
+int cpu_mmc_init(bd_t *bis)
 {
 #ifdef CONFIG_MXC_MMC
-	return mxc_mmc_init (bis);
+	return mxc_mmc_init(bis);
 #else
 	return 0;
 #endif

@@ -206,7 +206,7 @@ void mx25_uart1_init_pins(void)
 
 	muxctl = (struct iomuxc_mux_ctl *)IMX_IOPADMUX_BASE;
 	padctl = (struct iomuxc_pad_ctl *)IMX_IOPADCTL_BASE;
-	muxmode0 = MX25_PIN_MUX_MODE (0);
+	muxmode0 = MX25_PIN_MUX_MODE(0);
 	/*
 	 * set up input pins with hysteresis and 100K pull-ups
 	 */

@@ -227,25 +227,25 @@ void mx25_uart1_init_pins(void)
 
 	/* UART1 */
 	/* rxd */
-	writel (muxmode0, &muxctl->pad_uart1_rxd);
-	writel (inpadctl, &padctl->pad_uart1_rxd);
+	writel(muxmode0, &muxctl->pad_uart1_rxd);
+	writel(inpadctl, &padctl->pad_uart1_rxd);
 
 	/* txd */
-	writel (muxmode0, &muxctl->pad_uart1_txd);
-	writel (outpadctl, &padctl->pad_uart1_txd);
+	writel(muxmode0, &muxctl->pad_uart1_txd);
+	writel(outpadctl, &padctl->pad_uart1_txd);
 
 	/* rts */
-	writel (muxmode0, &muxctl->pad_uart1_rts);
-	writel (outpadctl, &padctl->pad_uart1_rts);
+	writel(muxmode0, &muxctl->pad_uart1_rts);
+	writel(outpadctl, &padctl->pad_uart1_rts);
 
 	/* cts */
-	writel (muxmode0, &muxctl->pad_uart1_cts);
-	writel (inpadctl, &padctl->pad_uart1_cts);
+	writel(muxmode0, &muxctl->pad_uart1_cts);
+	writel(inpadctl, &padctl->pad_uart1_cts);
 }
 #endif /* CONFIG_MXC_UART */
 
 #ifdef CONFIG_FEC_MXC
-void mx25_fec_init_pins (void)
+void mx25_fec_init_pins(void)
 {
 	struct iomuxc_mux_ctl *muxctl;
 	struct iomuxc_pad_ctl *padctl;

@@ -256,7 +256,7 @@ void mx25_fec_init_pins (void)
 
 	muxctl = (struct iomuxc_mux_ctl *)IMX_IOPADMUX_BASE;
 	padctl = (struct iomuxc_pad_ctl *)IMX_IOPADCTL_BASE;
-	muxmode0 = MX25_PIN_MUX_MODE (0);
+	muxmode0 = MX25_PIN_MUX_MODE(0);
 	inpadctl_100kpd = MX25_PIN_PAD_CTL_HYS
 	    | MX25_PIN_PAD_CTL_PKE
 	    | MX25_PIN_PAD_CTL_PUE | MX25_PIN_PAD_CTL_100K_PD;

@@ -275,40 +275,40 @@ void mx25_fec_init_pins (void)
 	outpadctl = MX25_PIN_PAD_CTL_PUE | MX25_PIN_PAD_CTL_100K_PD;
 
 	/* FEC_TX_CLK */
-	writel (muxmode0, &muxctl->pad_fec_tx_clk);
-	writel (inpadctl_100kpd, &padctl->pad_fec_tx_clk);
+	writel(muxmode0, &muxctl->pad_fec_tx_clk);
+	writel(inpadctl_100kpd, &padctl->pad_fec_tx_clk);
 
 	/* FEC_RX_DV */
-	writel (muxmode0, &muxctl->pad_fec_rx_dv);
-	writel (inpadctl_100kpd, &padctl->pad_fec_rx_dv);
+	writel(muxmode0, &muxctl->pad_fec_rx_dv);
+	writel(inpadctl_100kpd, &padctl->pad_fec_rx_dv);
 
 	/* FEC_RDATA0 */
-	writel (muxmode0, &muxctl->pad_fec_rdata0);
-	writel (inpadctl_100kpd, &padctl->pad_fec_rdata0);
+	writel(muxmode0, &muxctl->pad_fec_rdata0);
+	writel(inpadctl_100kpd, &padctl->pad_fec_rdata0);
 
 	/* FEC_TDATA0 */
-	writel (muxmode0, &muxctl->pad_fec_tdata0);
-	writel (outpadctl, &padctl->pad_fec_tdata0);
+	writel(muxmode0, &muxctl->pad_fec_tdata0);
+	writel(outpadctl, &padctl->pad_fec_tdata0);
 
 	/* FEC_TX_EN */
-	writel (muxmode0, &muxctl->pad_fec_tx_en);
-	writel (outpadctl, &padctl->pad_fec_tx_en);
+	writel(muxmode0, &muxctl->pad_fec_tx_en);
+	writel(outpadctl, &padctl->pad_fec_tx_en);
 
 	/* FEC_MDC */
-	writel (muxmode0, &muxctl->pad_fec_mdc);
-	writel (outpadctl, &padctl->pad_fec_mdc);
+	writel(muxmode0, &muxctl->pad_fec_mdc);
+	writel(outpadctl, &padctl->pad_fec_mdc);
 
 	/* FEC_MDIO */
-	writel (muxmode0, &muxctl->pad_fec_mdio);
-	writel (inpadctl_22kpu, &padctl->pad_fec_mdio);
+	writel(muxmode0, &muxctl->pad_fec_mdio);
+	writel(inpadctl_22kpu, &padctl->pad_fec_mdio);
 
 	/* FEC_RDATA1 */
-	writel (muxmode0, &muxctl->pad_fec_rdata1);
-	writel (inpadctl_100kpd, &padctl->pad_fec_rdata1);
+	writel(muxmode0, &muxctl->pad_fec_rdata1);
+	writel(inpadctl_100kpd, &padctl->pad_fec_rdata1);
 
 	/* FEC_TDATA1 */
-	writel (muxmode0, &muxctl->pad_fec_tdata1);
-	writel (outpadctl, &padctl->pad_fec_tdata1);
+	writel(muxmode0, &muxctl->pad_fec_tdata1);
+	writel(outpadctl, &padctl->pad_fec_tdata1);
 
 }
Signature · 1 line
1.7.1
author reviewer
#1 lore raw

PATCH v2 2/2 mx25: timer.c: Fix coding style

Running checkpatch on arch/arm/cpu/arm926ejs/mx25/timer.c we get:

total: 2 errors, 7 warnings, 182 lines checked

Fix these errors and warnings.

Signed-off-by Fabio Estevam <[email protected]>

---
Changes since v1:
- Fix typo on subject

 arch/arm/cpu/arm926ejs/mx25/timer.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)
arch/arm/cpu/arm926ejs/mx25/timer.c +8 -8
index 5eb2747..1cfd02b 100644
@@ -15,7 +15,7 @@
  *
  * (C) Copyright 2009 DENX Software Engineering
  * Author: John Rigby <[email protected]>
- * 	Add support for MX25
+ *	Add support for MX25
  *
  * See file CREDITS for list of people who contributed to this
  * project.

@@ -43,8 +43,8 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#define timestamp gd->tbl
-#define lastinc gd->lastinc
+#define timestamp	(gd->tbl)
+#define lastinc		(gd->lastinc)
 
 /*
  * "time" is measured in 1 / CONFIG_SYS_HZ seconds,

@@ -121,7 +121,7 @@ int timer_init(void)
 	return 0;
 }
 
-unsigned long long get_ticks (void)
+unsigned long long get_ticks(void)
 {
 	struct gpt_regs *gpt = (struct gpt_regs *)IMX_GPT1_BASE;
 	ulong now = readl(&gpt->counter); /* current tick value */

@@ -140,7 +140,7 @@ unsigned long long get_ticks (void)
 	return timestamp;
 }
 
-ulong get_timer_masked (void)
+ulong get_timer_masked(void)
 {
 	/*
 	 * get_ticks() returns a long long (64 bit), it wraps in

@@ -151,13 +151,13 @@ ulong get_timer_masked (void)
 	return tick_to_time(get_ticks());
 }
 
-ulong get_timer (ulong base)
+ulong get_timer(ulong base)
 {
-	return get_timer_masked () - base;
+	return get_timer_masked() - base;
 }
 
 /* delay x useconds AND preserve advance timstamp value */
-void __udelay (unsigned long usec)
+void __udelay(unsigned long usec)
 {
 	unsigned long long tmp;
 	ulong tmo;
Signature · 1 line
1.7.1
author reviewer
#2 lore raw

PATCH v2 1/1 mx25: reset.c: Fix coding style

In reply to Fabio Estevam

From: Fabio Estevam <[email protected]>

Fix errors/warnings reported by checkpatch.

Signed-off-by Fabio Estevam <[email protected]>

---
Changes since v1:
- Fix typo on subject

 arch/arm/cpu/arm926ejs/mx25/reset.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/cpu/arm926ejs/mx25/reset.c +1 -1
index 1a43683..e6f1056 100644
@@ -39,7 +39,7 @@
 /*
  * Reset the cpu by setting up the watchdog timer and let it time out
  */
-void reset_cpu (ulong ignored)
+void reset_cpu(ulong ignored)
 {
 	struct wdog_regs *regs = (struct wdog_regs *)IMX_WDT_BASE;
 	/* Disable watchdog and set Time-Out field to 0 */
Signature · 1 line
1.7.1
author reviewer
#3 lore raw

PATCH v2 1/3 mx27: generic.c: Fix coding style

In reply to Fabio Estevam

Fix warning reported by checkpatch.

Signed-off-by Fabio Estevam <[email protected]>

---
Changes since v1:
- Fix typo on subject

 arch/arm/cpu/arm926ejs/mx27/generic.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/cpu/arm926ejs/mx27/generic.c +1 -1
index 222a8e9..33640ce 100644
@@ -153,7 +153,7 @@ ulong imx_get_perclk4(void)
 }
 
 #if defined(CONFIG_DISPLAY_CPUINFO)
-int print_cpuinfo (void)
+int print_cpuinfo(void)
 {
 	char buf[32];
Signature · 1 line
1.7.1
author reviewer
#4 lore raw

PATCH v2 2/3 mx27: timer.c: Fix coding style

In reply to Fabio Estevam

Fix warnings reported by checkpatch.

Signed-off-by Fabio Estevam <[email protected]>

---
Changes since v1:
- Fix typo on subject

 arch/arm/cpu/arm926ejs/mx27/timer.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)
arch/arm/cpu/arm926ejs/mx27/timer.c +7 -7
index df76d16..5af9359 100644
@@ -45,8 +45,8 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#define timestamp gd->tbl
-#define lastinc gd->lastinc
+#define timestamp	(gd->tbl)
+#define lastinc		(gd->lastinc)
 
 /*
  * "time" is measured in 1 / CONFIG_SYS_HZ seconds,

@@ -124,7 +124,7 @@ int timer_init(void)
 	return 0;
 }
 
-unsigned long long get_ticks (void)
+unsigned long long get_ticks(void)
 {
 	struct gpt_regs *regs = (struct gpt_regs *)IMX_TIM1_BASE;
 	ulong now = readl(&regs->gpt_tcn); /* current tick value */

@@ -143,7 +143,7 @@ unsigned long long get_ticks (void)
 	return timestamp;
 }
 
-ulong get_timer_masked (void)
+ulong get_timer_masked(void)
 {
 	/*
 	 * get_ticks() returns a long long (64 bit), it wraps in

@@ -154,13 +154,13 @@ ulong get_timer_masked (void)
 	return tick_to_time(get_ticks());
 }
 
-ulong get_timer (ulong base)
+ulong get_timer(ulong base)
 {
-	return get_timer_masked () - base;
+	return get_timer_masked() - base;
 }
 
 /* delay x useconds AND preserve advance timstamp value */
-void __udelay (unsigned long usec)
+void __udelay(unsigned long usec)
 {
 	unsigned long long tmp;
 	ulong tmo;
Signature · 1 line
1.7.1
author reviewer
#5 lore raw

PATCH v2 3/3 mx27: reset.c: Fix coding style

In reply to Fabio Estevam

Fix warning reported by checkpatch.

Signed-off-by Fabio Estevam <[email protected]>

---
Changes since v1:
- Fix typo on subject

 arch/arm/cpu/arm926ejs/mx27/reset.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/cpu/arm926ejs/mx27/reset.c +1 -1
index 6c54eaf..cc0a33e 100644
@@ -39,7 +39,7 @@
 /*
  * Reset the cpu by setting up the watchdog timer and let it time out
  */
-void reset_cpu (ulong ignored)
+void reset_cpu(ulong ignored)
 {
 	struct wdog_regs *regs = (struct wdog_regs *)IMX_WDT_BASE;
 	/* Disable watchdog and set Time-Out field to 0 */
Signature · 1 line
1.7.1
author reviewer
#6 lore raw

PATCH v2 1/1 mx35: generic.c: Fix coding style

In reply to Fabio Estevam

Fix warning reported by checkpatch.

Signed-off-by Fabio Estevam <[email protected]>

---
Changes since v1:
- Fix typo on subject

 arch/arm/cpu/arm1136/mx35/generic.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/cpu/arm1136/mx35/generic.c +1 -1
index fcfaba5..1b9809b 100644
@@ -240,7 +240,7 @@ unsigned int mxc_get_main_clock(enum mxc_main_clocks clk)
 		}
 		break;
 	case IPG_CLK:
-		ret_val = get_ipg_clk();;
+		ret_val = get_ipg_clk();
 		break;
 	case IPG_PER_CLK:
 		ret_val = get_ipg_per_clk();
Signature · 1 line
1.7.1
author reviewer
#7 lore raw

PATCH v2 1/1 mx31: timer.c: Fix coding style

In reply to Fabio Estevam

Fix warnings/errors reported by checkpatch.

Signed-off-by Fabio Estevam <[email protected]>

---
Changes since v1:
- Fix typo on subject

 arch/arm/cpu/arm1136/mx31/timer.c |   22 +++++++++++++---------
 1 files changed, 13 insertions(+), 9 deletions(-)
arch/arm/cpu/arm1136/mx31/timer.c +13 -9
index 717a2b7..d3a461e 100644
@@ -43,7 +43,10 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-/* "time" is measured in 1 / CONFIG_SYS_HZ seconds, "tick" is internal timer period */
+/* "time" is measured in 1 / CONFIG_SYS_HZ seconds,
+ * "tick" is internal timer period
+ */
+
 #ifdef CONFIG_MX31_TIMER_HIGH_PRECISION
 /* ~0.4% error - measured with stop-watch on 100s boot-delay */
 static inline unsigned long long tick_to_time(unsigned long long tick)

@@ -68,7 +71,8 @@ static inline unsigned long long us_to_tick(unsigned long long us)
 }
 #else
 /* ~2% error */
-#define TICK_PER_TIME	((CONFIG_MX31_CLK32 + CONFIG_SYS_HZ / 2) / CONFIG_SYS_HZ)
+#define TICK_PER_TIME	((CONFIG_MX31_CLK32 + CONFIG_SYS_HZ / 2) \
+							/ CONFIG_SYS_HZ)
 #define US_PER_TICK	(1000000 / CONFIG_MX31_CLK32)
 
 static inline unsigned long long tick_to_time(unsigned long long tick)

@@ -91,7 +95,7 @@ static inline unsigned long long us_to_tick(unsigned long long us)
 #endif
 
 /* The 32768Hz 32-bit timer overruns in 131072 seconds */
-int timer_init (void)
+int timer_init(void)
 {
 	int i;
 

@@ -106,7 +110,7 @@ int timer_init (void)
 	return 0;
 }
 
-unsigned long long get_ticks (void)
+unsigned long long get_ticks(void)
 {
 	ulong now = GPTCNT; /* current tick value */
 

@@ -119,7 +123,7 @@ unsigned long long get_ticks (void)
 	return gd->tbl;
 }
 
-ulong get_timer_masked (void)
+ulong get_timer_masked(void)
 {
 	/*
 	 * get_ticks() returns a long long (64 bit), it wraps in

@@ -130,13 +134,13 @@ ulong get_timer_masked (void)
 	return tick_to_time(get_ticks());
 }
 
-ulong get_timer (ulong base)
+ulong get_timer(ulong base)
 {
-	return get_timer_masked () - base;
+	return get_timer_masked() - base;
 }
 
 /* delay x useconds AND preserve advance timestamp value */
-void __udelay (unsigned long usec)
+void __udelay(unsigned long usec)
 {
 	unsigned long long tmp;
 	ulong tmo;

@@ -148,7 +152,7 @@ void __udelay (unsigned long usec)
 		 /*NOP*/;
 }
 
-void reset_cpu (ulong addr)
+void reset_cpu(ulong addr)
 {
 	struct wdog_regs *wdog = (struct wdog_regs *)WDOG_BASE;
 	wdog->wcr = WDOG_ENABLE;
Signature · 1 line
1.7.1
author reviewer
#8 lore raw

PATCH v2 1/1 mx5: soc.c: Fix coding style

In reply to Fabio Estevam

Do not declare extern in c files as pointed out by checkpatch.

Signed-off-by Fabio Estevam <[email protected]>

---
Changes since v1:
- Fix typo on subject

 arch/arm/cpu/armv7/mx5/soc.c              |   10 ++--------
 arch/arm/include/asm/arch-mx5/sys_proto.h |   10 ++++++++++
 2 files changed, 12 insertions(+), 8 deletions(-)
arch/arm/cpu/armv7/mx5/soc.c +2 -8
index c6106d5..cf12ba8 100644
@@ -26,6 +26,8 @@
 #include <common.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/clock.h>
+#include <asm/arch/sys_proto.h>
+
 #include <asm/errno.h>
 #include <asm/io.h>
 

@@ -117,14 +119,6 @@ int print_cpuinfo(void)
 }
 #endif
 
-/*
- * Initializes on-chip ethernet controllers.
- * to override, implement board_eth_init()
- */
-#if defined(CONFIG_FEC_MXC)
-extern int fecmxc_initialize(bd_t *bis);
-#endif
-
 int cpu_eth_init(bd_t *bis)
 {
 	int rc = -ENODEV;
arch/arm/include/asm/arch-mx5/sys_proto.h +10 -0
index ce63675..789558e 100644
@@ -28,4 +28,14 @@ u32 get_cpu_rev(void);
 #define is_soc_rev(rev)	((get_cpu_rev() & 0xFF) - rev)
 void sdelay(unsigned long);
 void set_chipselect_size(int const);
+
+/*
+ * Initializes on-chip ethernet controllers.
+ * to override, implement board_eth_init()
+ */
+#if defined(CONFIG_FEC_MXC)
+int fecmxc_initialize(bd_t *bis);
+
+#endif
+
 #endif
Signature · 1 line
1.7.1
author reviewer
#9 lore raw

PATCH v2 1/5 mx31ads: Fix coding style

In reply to Fabio Estevam

Fix warning generated by checkpatch.

Signed-off-by Fabio Estevam <[email protected]>

---
Changes since v1:
- Fix typo on subject

 board/freescale/mx31ads/mx31ads.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
board/freescale/mx31ads/mx31ads.c +1 -1
index 4dd1e63..a8a9ddb 100644
@@ -104,7 +104,7 @@ int board_init(void)
 	return 0;
 }
 
-int checkboard (void)
+int checkboard(void)
 {
 	printf("Board: MX31ADS\n");
 	return 0;
Signature · 1 line
1.7.1
author reviewer
#10 lore raw

PATCH v2 2/5 qong: Fix codying style

In reply to Fabio Estevam

Fix warnings generated by checkpatch.

Signed-off-by Fabio Estevam <[email protected]>

---
Changes since v1:
- Fix typo on subject

 board/davedenx/qong/qong.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
board/davedenx/qong/qong.c +5 -5
index 99432ed..d362dab 100644
@@ -41,7 +41,7 @@ void hw_watchdog_reset(void)
 }
 #endif
 
-int dram_init (void)
+int dram_init(void)
 {
 	/* dram_init must store complete ramsize in gd->ram_size */
 	gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,

@@ -58,7 +58,7 @@ static void qong_fpga_reset(void)
 	udelay(300);
 }
 
-int board_early_init_f (void)
+int board_early_init_f(void)
 {
 #ifdef CONFIG_QONG_FPGA
 	/* CS1: FPGA/Network Controller/GPIO */

@@ -141,7 +141,7 @@ int board_early_init_f (void)
 
 }
 
-int board_init (void)
+int board_init(void)
 {
 	/* Chip selects */
 	/* CS0: Nor Flash #0 - it must be init'ed when executing from DDR */

@@ -216,13 +216,13 @@ int board_late_init(void)
 	return 0;
 }
 
-int checkboard (void)
+int checkboard(void)
 {
 	printf("Board: DAVE/DENX Qong\n");
 	return 0;
 }
 
-int misc_init_r (void)
+int misc_init_r(void)
 {
 #ifdef CONFIG_QONG_FPGA
 	u32 tmp;
Signature · 1 line
1.7.1
author reviewer
#11 lore raw

PATCH v2 3/5 tx25: Fix coding style

In reply to Fabio Estevam

Fix warning generated by checkpatch.

Signed-off-by Fabio Estevam <[email protected]>

---
Changes since v1:
- Fix typo on subject

 board/karo/tx25/tx25.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
board/karo/tx25/tx25.c +1 -1
index 307ffd0..bbf12ec 100644
@@ -157,7 +157,7 @@ int board_late_init(void)
 	return 0;
 }
 
-int dram_init (void)
+int dram_init(void)
 {
 	/* dram_init must store complete ramsize in gd->ram_size */
 	gd->ram_size = get_ram_size((void *)PHYS_SDRAM_1,
Signature · 1 line
1.7.1
author reviewer
#12 lore raw

PATCH v2 4/5 imx27lite: Fix coding style

In reply to Fabio Estevam

Fix warnings generated by checkpatch.

Signed-off-by Fabio Estevam <[email protected]>

---
Changes since v1:
- Fix typo on subject

 board/logicpd/imx27lite/imx27lite.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
board/logicpd/imx27lite/imx27lite.c +3 -3
index 2b273ac..8a5015c 100644
@@ -26,7 +26,7 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-int board_init (void)
+int board_init(void)
 {
 	struct gpio_regs *regs = (struct gpio_regs *)IMX_GPIO_BASE;
 #if defined(CONFIG_SYS_NAND_LARGEPAGE)

@@ -64,7 +64,7 @@ int board_init (void)
 	return 0;
 }
 
-int dram_init (void)
+int dram_init(void)
 {
 	/* dram_init must store complete ramsize in gd->ram_size */
 	gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,

@@ -86,7 +86,7 @@ void dram_init_banksize(void)
 
 int checkboard(void)
 {
-	puts ("Board: ");
+	puts("Board: ");
 	puts(CONFIG_BOARDNAME);
 	return 0;
 }
Signature · 1 line
1.7.1
author reviewer
#13 lore raw

PATCH v2 5/5 imx31_litekit: Fix coding style

In reply to Fabio Estevam

Fix warning generated by checkpatch.

Signed-off-by Fabio Estevam <[email protected]>

---
Changes since v1:
- Fix typo on subject

 board/logicpd/imx31_litekit/imx31_litekit.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
board/logicpd/imx31_litekit/imx31_litekit.c +1 -1
index 7214008..8393ccb 100644
@@ -75,7 +75,7 @@ int board_init(void)
 	return 0;
 }
 
-int checkboard (void)
+int checkboard(void)
 {
 	printf("Board: i.MX31 Litekit\n");
 	return 0;
Signature · 1 line
1.7.1
#14 lore raw

PATCH v2 1/2 mx25: generic.c: Fix coding style

In reply to Fabio Estevam
Quoted 6 lines · Fabio Estevam

Running checkpatch on arch/arm/cpu/arm926ejs/mx25/generic.c we get:

total: 2 errors, 59 warnings, 326 lines checked

Fix these errors and warnings.

Quoted 8 lines
Signed-off-by Fabio Estevam <[email protected]>

---
Changes since v1:
- Fixed typo on subject

 arch/arm/cpu/arm926ejs/mx25/generic.c |  110 ++++++++++++++++----------------
 1 files changed, 55 insertions(+), 55 deletions(-)

Hi Fabio,

what about to squash all your patches of this type into a single patch ? It seems to me they all fix coding style in i.MX code according to the result of checkpatch, and in most cases the changes are due to whitespace before parenthesis. So the rule to fix a single issue in one patch is IMHO maintained.

I have not checked, but a single patch should not overwrite the maximum size allowed for this ML.

I am wondering if this method should be exported for all U-Boot code. I agree to push your patches, but most issues reported by checkpatch are due to different coding style between u-boot and linux in the past and checkpatch reports surely a lot of warnings on old u-boot code.

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80  Email: office at denx.de
=====================================================================