From cd6881b519c94b15907d4f28149e5ed3fd0beea5 Mon Sep 17 00:00:00 2001
From: Wolfgang Denk <wd@denx.de>
Date: Thu, 19 May 2011 22:21:41 +0200
Subject: [PATCH] Minor coding style cleanup.
Signed-off-by: Wolfgang Denk <wd@denx.de>
---
arch/arm/cpu/armv7/start.S | 2 +-
arch/arm/lib/memcpy.S | 1 -
arch/powerpc/cpu/mpc85xx/speed.c | 2 +-
arch/x86/cpu/sc520/sc520.c | 1 -
board/freescale/common/sdhc_boot.c | 1 -
board/ti/beagle/led.c | 1 -
common/cmd_led.c | 2 +-
doc/README.arm-relocation | 4 ++--
doc/README.p1022ds | 1 -
drivers/misc/fsl_law.c | 4 ++--
drivers/mmc/mmc.c | 8 ++++----
drivers/net/phy/generic_10g.c | 1 -
drivers/net/tsec.c | 1 -
include/configs/P3041DS.h | 1 -
include/configs/P5020DS.h | 1 -
include/fsl_mdio.h | 1 -
16 files changed, 11 insertions(+), 21 deletions(-)
diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S
index 2929fc7e32..d91ae12cb9 100644
--- a/arch/arm/cpu/armv7/start.S
+++ b/arch/arm/cpu/armv7/start.S
@@ -79,7 +79,7 @@ _TEXT_BASE:
*/
.globl _armboot_start
_armboot_start:
- .word _start
+ .word _start
#endif
/*
diff --git a/arch/arm/lib/memcpy.S b/arch/arm/lib/memcpy.S
index 40db90e5f4..3b5aeec4cf 100644
--- a/arch/arm/lib/memcpy.S
+++ b/arch/arm/lib/memcpy.S
@@ -238,4 +238,3 @@ memcpy:
17: forward_copy_shift pull=16 push=16
18: forward_copy_shift pull=24 push=8
-
diff --git a/arch/powerpc/cpu/mpc85xx/speed.c b/arch/powerpc/cpu/mpc85xx/speed.c
index c4c156d737..a83dfeb84c 100644
--- a/arch/powerpc/cpu/mpc85xx/speed.c
+++ b/arch/powerpc/cpu/mpc85xx/speed.c
@@ -112,7 +112,7 @@ void get_sys_info (sys_info_t * sysInfo)
#if (CONFIG_SYS_FSL_NUM_CC_PLLS == 2)
#define HWA_CC_PLL 1
#elif (CONFIG_SYS_FSL_NUM_CC_PLLS == 4)
-#define HWA_CC_PLL 2
+#define HWA_CC_PLL 2
#else
#error CONFIG_SYS_FSL_NUM_CC_PLLS not set or unknown case
#endif
diff --git a/arch/x86/cpu/sc520/sc520.c b/arch/x86/cpu/sc520/sc520.c
index 8c410a2337..726a325358 100644
--- a/arch/x86/cpu/sc520/sc520.c
+++ b/arch/x86/cpu/sc520/sc520.c
@@ -64,4 +64,3 @@ int cpu_init_r(void)
return x86_cpu_init_r();
}
-
diff --git a/board/freescale/common/sdhc_boot.c b/board/freescale/common/sdhc_boot.c
index 964c6b830c..e4323181fc 100644
--- a/board/freescale/common/sdhc_boot.c
+++ b/board/freescale/common/sdhc_boot.c
@@ -61,4 +61,3 @@ int mmc_get_env_addr(struct mmc *mmc, u32 *env_addr)
return 0;
}
-
diff --git a/board/ti/beagle/led.c b/board/ti/beagle/led.c
index df26552986..08f95a0a16 100644
--- a/board/ti/beagle/led.c
+++ b/board/ti/beagle/led.c
@@ -88,4 +88,3 @@ void __led_set (led_id_t mask, int state)
}
#endif
}
-
diff --git a/common/cmd_led.c b/common/cmd_led.c
index f1e8a62cb6..c53195f1a3 100644
--- a/common/cmd_led.c
+++ b/common/cmd_led.c
@@ -96,7 +96,7 @@ int do_led (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
}
for (i = 0; led_commands[i].string; i++) {
- if ((strcmp("all", argv[1]) == 0) ||
+ if ((strcmp("all", argv[1]) == 0) ||
(strcmp(led_commands[i].string, argv[1]) == 0)) {
if (led_commands[i].on) {
if (state) {
diff --git a/doc/README.arm-relocation b/doc/README.arm-relocation
index 45f5ea7146..5a9a2fb071 100644
--- a/doc/README.arm-relocation
+++ b/doc/README.arm-relocation
@@ -177,9 +177,9 @@ ip_addr = XXXXXXXXXX
baudrate = XXXXXXXXXX
TLB addr = XXXXXXXXXX
relocaddr = 0x8ff08000
- ^^^^^^^^^^
+ ^^^^^^^^^^
reloc off = XXXXXXXXXX
-irq_sp = XXXXXXXXXX
+irq_sp = XXXXXXXXXX
sp start = XXXXXXXXXX
FB base = XXXXXXXXXX
diff --git a/doc/README.p1022ds b/doc/README.p1022ds
index 473ecf6217..04d9197074 100644
--- a/doc/README.p1022ds
+++ b/doc/README.p1022ds
@@ -21,4 +21,3 @@ and AUDIO codec clock sources only setting as 11MHz or 12MHz !
'setenv hwconfig 'audclk:12;tdm' --- error !
'setenv hwconfig 'audclk:11;tdm' --- error !
'setenv hwconfig 'audclk:10' --- error !
-
diff --git a/drivers/misc/fsl_law.c b/drivers/misc/fsl_law.c
index 3233ff2e49..a7d04b7ea3 100644
--- a/drivers/misc/fsl_law.c
+++ b/drivers/misc/fsl_law.c
@@ -247,13 +247,13 @@ void init_laws(void)
#error FSL_HW_NUM_LAWS can not be greater than 32 w/o code changes
#endif
- /*
+ /*
* Any LAWs that were set up before we booted assume they are meant to
* be around and mark them used.
*/
for (i = 0; i < FSL_HW_NUM_LAWS; i++) {
u32 lawar = in_be32(LAWAR_ADDR(i));
-
+
if (lawar & LAW_EN)
gd->used_laws |= (1 << i);
}
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index 1d089a7d11..21aedbaa3f 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -434,14 +434,14 @@ int mmc_send_op_cond(struct mmc *mmc)
cmd.resp_type = MMC_RSP_R3;
cmd.cmdarg = 0;
cmd.flags = 0;
-
+
err = mmc_send_cmd(mmc, &cmd, NULL);
-
+
if (err)
return err;
-
+
udelay(1000);
-
+
do {
cmd.cmdidx = MMC_CMD_SEND_OP_COND;
cmd.resp_type = MMC_RSP_R3;
diff --git a/drivers/net/phy/generic_10g.c b/drivers/net/phy/generic_10g.c
index 315c50867d..60dec457bf 100644
--- a/drivers/net/phy/generic_10g.c
+++ b/drivers/net/phy/generic_10g.c
@@ -102,4 +102,3 @@ struct phy_driver gen10g_driver = {
.startup = gen10g_startup,
.shutdown = gen10g_shutdown,
};
-
diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c
index 06e5834a94..78ffc95c53 100644
--- a/drivers/net/tsec.c
+++ b/drivers/net/tsec.c
@@ -593,4 +593,3 @@ int tsec_standard_init(bd_t *bis)
return tsec_eth_init(bis, tsec_info, ARRAY_SIZE(tsec_info));
}
-
diff --git a/include/configs/P3041DS.h b/include/configs/P3041DS.h
index 46f91ccfc3..d9e8f51935 100644
--- a/include/configs/P3041DS.h
+++ b/include/configs/P3041DS.h
@@ -34,4 +34,3 @@
#define CONFIG_ICS307_REFCLK_HZ 25000000 /* ICS307 ref clk freq */
#include "corenet_ds.h"
-
diff --git a/include/configs/P5020DS.h b/include/configs/P5020DS.h
index 6d279b393e..dd8d442e33 100644
--- a/include/configs/P5020DS.h
+++ b/include/configs/P5020DS.h
@@ -34,4 +34,3 @@
#define CONFIG_ICS307_REFCLK_HZ 25000000 /* ICS307 ref clk freq */
#include "corenet_ds.h"
-
diff --git a/include/fsl_mdio.h b/include/fsl_mdio.h
index 17ca79c905..ea8b54b56f 100644
--- a/include/fsl_mdio.h
+++ b/include/fsl_mdio.h
@@ -59,4 +59,3 @@ struct fsl_pq_mdio_info {
int fsl_pq_mdio_init(bd_t *bis, struct fsl_pq_mdio_info *info);
#endif /* __FSL_PHY_H__ */
-