qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove volatile qualifier in get_ram_size() calls 

Checkpatch.pl complains about the volatile qualifier in calls to
get_ram_size(). Remove this qualifier in the prototype and in the
calls where it is useless, and leave it only in the function body
where it is needed.

Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
This commit is contained in:
Albert ARIBAUD 2011-07-03 05:55:33 +00:00
parent 930f335592
commit a55d23ccf6
27 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/cpu/arm926ejs/orion5x/dram.c
View File

@ -53,7 +53,7 @@ int dram_init (void)
{ {
/* dram_init must store complete ramsize in gd->ram_size */ /* dram_init must store complete ramsize in gd->ram_size */
gd->ram_size = get_ram_size( gd->ram_size = get_ram_size(
(volatile long *) orion5x_sdram_bar(0), (long *) orion5x_sdram_bar(0),
CONFIG_MAX_RAM_BANK_SIZE); CONFIG_MAX_RAM_BANK_SIZE);
return 0; return 0;
} }
@ -65,7 +65,7 @@ void dram_init_banksize (void)
for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) { for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) {
gd->bd->bi_dram[i].start = orion5x_sdram_bar(i); gd->bd->bi_dram[i].start = orion5x_sdram_bar(i);
gd->bd->bi_dram[i].size = get_ram_size( gd->bd->bi_dram[i].size = get_ram_size(
(volatile long *) (gd->bd->bi_dram[i].start), (long *) (gd->bd->bi_dram[i].start),
CONFIG_MAX_RAM_BANK_SIZE); CONFIG_MAX_RAM_BANK_SIZE);
} }
} }

2
board/BuS/eb_cpux9k2/cpux9k2.c
View File

@ -141,7 +141,7 @@ void reset_phy(void)
int dram_init(void) int dram_init(void)
{ {
gd->ram_size = get_ram_size((volatile long *)CONFIG_SYS_SDRAM_BASE, gd->ram_size = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE,
CONFIG_SYS_SDRAM_SIZE); CONFIG_SYS_SDRAM_SIZE);
return 0; return 0;
} }

2
board/atmel/at91rm9200ek/at91rm9200ek.c
View File

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

2
board/davedenx/qong/qong.c
View File

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

2
board/davinci/common/misc.c
View File

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

2
board/efikamx/efikamx.c
View File

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

2
board/eukrea/cpu9260/cpu9260.c
View File

@ -174,7 +174,7 @@ int board_init(void)
int dram_init(void) int dram_init(void)
{ {
gd->ram_size = get_ram_size((volatile long *)CONFIG_SYS_SDRAM_BASE, gd->ram_size = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE,
CONFIG_SYS_SDRAM_SIZE); CONFIG_SYS_SDRAM_SIZE);
return 0; return 0;
} }

2
board/eukrea/cpuat91/cpuat91.c
View File

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

2
board/freescale/mx31ads/mx31ads.c
View File

@ -31,7 +31,7 @@ DECLARE_GLOBAL_DATA_PTR;
int dram_init(void) int dram_init(void)
{ {
/* dram_init must store complete ramsize in gd->ram_size */ /* dram_init must store complete ramsize in gd->ram_size */
gd->ram_size = get_ram_size((volatile void *)PHYS_SDRAM_1, gd->ram_size = get_ram_size((void *)PHYS_SDRAM_1,
PHYS_SDRAM_1_SIZE); PHYS_SDRAM_1_SIZE);
return 0; return 0;
} }

2
board/freescale/mx31pdk/mx31pdk.c
View File

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

2
board/freescale/mx51evk/mx51evk.c
View File

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

4
board/freescale/mx53ard/mx53ard.c
View File

@ -46,8 +46,8 @@ int dram_init(void)
{ {
u32 size1, size2; u32 size1, size2;
size1 = get_ram_size((volatile void *)PHYS_SDRAM_1, PHYS_SDRAM_1_SIZE); size1 = get_ram_size((void *)PHYS_SDRAM_1, PHYS_SDRAM_1_SIZE);
size2 = get_ram_size((volatile void *)PHYS_SDRAM_2, PHYS_SDRAM_2_SIZE); size2 = get_ram_size((void *)PHYS_SDRAM_2, PHYS_SDRAM_2_SIZE);
gd->ram_size = size1 + size2; gd->ram_size = size1 + size2;

2
board/freescale/mx53evk/mx53evk.c
View File

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

4
board/freescale/mx53loco/mx53loco.c
View File

@ -47,8 +47,8 @@ int dram_init(void)
{ {
u32 size1, size2; u32 size1, size2;
size1 = get_ram_size((volatile void *)PHYS_SDRAM_1, PHYS_SDRAM_1_SIZE); size1 = get_ram_size((void *)PHYS_SDRAM_1, PHYS_SDRAM_1_SIZE);
size2 = get_ram_size((volatile void *)PHYS_SDRAM_2, PHYS_SDRAM_2_SIZE); size2 = get_ram_size((void *)PHYS_SDRAM_2, PHYS_SDRAM_2_SIZE);
gd->ram_size = size1 + size2; gd->ram_size = size1 + size2;

4
board/freescale/mx53smd/mx53smd.c
View File

@ -44,8 +44,8 @@ int dram_init(void)
{ {
u32 size1, size2; u32 size1, size2;
size1 = get_ram_size((volatile void *)PHYS_SDRAM_1, PHYS_SDRAM_1_SIZE); size1 = get_ram_size((void *)PHYS_SDRAM_1, PHYS_SDRAM_1_SIZE);
size2 = get_ram_size((volatile void *)PHYS_SDRAM_2, PHYS_SDRAM_2_SIZE); size2 = get_ram_size((void *)PHYS_SDRAM_2, PHYS_SDRAM_2_SIZE);
gd->ram_size = size1 + size2; gd->ram_size = size1 + size2;

2
board/imx31_phycore/imx31_phycore.c
View File

@ -33,7 +33,7 @@ DECLARE_GLOBAL_DATA_PTR;
int dram_init(void) int dram_init(void)
{ {
/* dram_init must store complete ramsize in gd->ram_size */ /* dram_init must store complete ramsize in gd->ram_size */
gd->ram_size = get_ram_size((volatile void *)PHYS_SDRAM_1, gd->ram_size = get_ram_size((void *)PHYS_SDRAM_1,
PHYS_SDRAM_1_SIZE); PHYS_SDRAM_1_SIZE);
return 0; return 0;
} }

6
board/karo/tx25/tx25.c
View File

@ -160,7 +160,7 @@ int board_late_init(void)
int dram_init (void) int dram_init (void)
{ {
/* dram_init must store complete ramsize in gd->ram_size */ /* dram_init must store complete ramsize in gd->ram_size */
gd->ram_size = get_ram_size((volatile void *)PHYS_SDRAM_1, gd->ram_size = get_ram_size((void *)PHYS_SDRAM_1,
PHYS_SDRAM_1_SIZE); PHYS_SDRAM_1_SIZE);
return 0; return 0;
} }
@ -168,11 +168,11 @@ int dram_init (void)
void dram_init_banksize(void) void dram_init_banksize(void)
{ {
gd->bd->bi_dram[0].start = PHYS_SDRAM_1; gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
gd->bd->bi_dram[0].size = get_ram_size((volatile void *)PHYS_SDRAM_1, gd->bd->bi_dram[0].size = get_ram_size((void *)PHYS_SDRAM_1,
PHYS_SDRAM_1_SIZE); PHYS_SDRAM_1_SIZE);
#if CONFIG_NR_DRAM_BANKS > 1 #if CONFIG_NR_DRAM_BANKS > 1
gd->bd->bi_dram[1].start = PHYS_SDRAM_2; gd->bd->bi_dram[1].start = PHYS_SDRAM_2;
gd->bd->bi_dram[1].size = get_ram_size((volatile void *)PHYS_SDRAM_2, gd->bd->bi_dram[1].size = get_ram_size((void *)PHYS_SDRAM_2,
PHYS_SDRAM_2_SIZE); PHYS_SDRAM_2_SIZE);
#else #else

2
board/keymile/km_arm/km_arm.c
View File

@ -321,7 +321,7 @@ int dram_init(void)
{ {
/* dram_init must store complete ramsize in gd->ram_size */ /* dram_init must store complete ramsize in gd->ram_size */
/* Fix this */ /* Fix this */
gd->ram_size = get_ram_size((volatile void *)kw_sdram_bar(0), gd->ram_size = get_ram_size((void *)kw_sdram_bar(0),
kw_sdram_bs(0)); kw_sdram_bs(0));
return 0; return 0;
} }

6
board/logicpd/imx27lite/imx27lite.c
View File

@ -67,7 +67,7 @@ int board_init (void)
int dram_init (void) int dram_init (void)
{ {
/* dram_init must store complete ramsize in gd->ram_size */ /* dram_init must store complete ramsize in gd->ram_size */
gd->ram_size = get_ram_size((volatile void *)CONFIG_SYS_SDRAM_BASE, gd->ram_size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
PHYS_SDRAM_1_SIZE); PHYS_SDRAM_1_SIZE);
return 0; return 0;
} }
@ -75,11 +75,11 @@ int dram_init (void)
void dram_init_banksize(void) void dram_init_banksize(void)
{ {
gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE; gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
gd->bd->bi_dram[0].size = get_ram_size((volatile void *)CONFIG_SYS_SDRAM_BASE, gd->bd->bi_dram[0].size = get_ram_size((void *)CONFIG_SYS_SDRAM_BASE,
PHYS_SDRAM_1_SIZE); PHYS_SDRAM_1_SIZE);
#if CONFIG_NR_DRAM_BANKS > 1 #if CONFIG_NR_DRAM_BANKS > 1
gd->bd->bi_dram[1].start = PHYS_SDRAM_2; gd->bd->bi_dram[1].start = PHYS_SDRAM_2;
gd->bd->bi_dram[1].size = get_ram_size((volatile void *)PHYS_SDRAM_2, gd->bd->bi_dram[1].size = get_ram_size((void *)PHYS_SDRAM_2,
PHYS_SDRAM_2_SIZE); PHYS_SDRAM_2_SIZE);
#endif #endif
} }

2
board/logicpd/imx31_litekit/imx31_litekit.c
View File

@ -32,7 +32,7 @@ DECLARE_GLOBAL_DATA_PTR;
int dram_init(void) int dram_init(void)
{ {
/* dram_init must store complete ramsize in gd->ram_size */ /* dram_init must store complete ramsize in gd->ram_size */
gd->ram_size = get_ram_size((volatile void *)PHYS_SDRAM_1, gd->ram_size = get_ram_size((void *)PHYS_SDRAM_1,
PHYS_SDRAM_1_SIZE); PHYS_SDRAM_1_SIZE);
return 0; return 0;
} }

2
board/mx1ads/mx1ads.c
View File

@ -169,7 +169,7 @@ int board_late_init (void)
int dram_init(void) int dram_init(void)
{ {
/* dram_init must store complete ramsize in gd->ram_size */ /* dram_init must store complete ramsize in gd->ram_size */
gd->ram_size = get_ram_size((volatile void *)PHYS_SDRAM_1, gd->ram_size = get_ram_size((void *)PHYS_SDRAM_1,
PHYS_SDRAM_1_SIZE); PHYS_SDRAM_1_SIZE);
return 0; return 0;
} }

2
board/ronetix/pm9261/pm9261.c
View File

@ -282,7 +282,7 @@ int board_eth_init(bd_t *bis)
int dram_init(void) int dram_init(void)
{ {
/* dram_init must store complete ramsize in gd->ram_size */ /* dram_init must store complete ramsize in gd->ram_size */
gd->ram_size = get_ram_size((volatile void *)PHYS_SDRAM, gd->ram_size = get_ram_size((void *)PHYS_SDRAM,
PHYS_SDRAM_SIZE); PHYS_SDRAM_SIZE);
return 0; return 0;
} }

2
board/ronetix/pm9263/pm9263.c
View File

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

2
board/ronetix/pm9g45/pm9g45.c
View File

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

2
board/syteco/jadecpu/jadecpu.c
View File

@ -152,7 +152,7 @@ int misc_init_r(void)
int dram_init(void) int dram_init(void)
{ {
/* dram_init must store complete ramsize in gd->ram_size */ /* dram_init must store complete ramsize in gd->ram_size */
gd->ram_size = get_ram_size((volatile void *)PHYS_SDRAM, gd->ram_size = get_ram_size((void *)PHYS_SDRAM,
PHYS_SDRAM_SIZE); PHYS_SDRAM_SIZE);
return 0; return 0;

2
common/memsize.c
View File

@ -37,7 +37,7 @@
* the actually available RAM size between addresses `base' and * the actually available RAM size between addresses `base' and
* `base + maxsize'. * `base + maxsize'.
*/ */
long get_ram_size(volatile long *base, long maxsize) long get_ram_size(long *base, long maxsize)
{ {
volatile long *addr; volatile long *addr;
long save[32]; long save[32];

2
include/common.h
View File

@ -317,7 +317,7 @@ const char *symbol_lookup(unsigned long addr, unsigned long *caddr);
void api_init (void); void api_init (void);
/* common/memsize.c */ /* common/memsize.c */
long get_ram_size (volatile long *, long); long get_ram_size (long *, long);
/* $(BOARD)/$(BOARD).c */ /* $(BOARD)/$(BOARD).c */
void reset_phy (void); void reset_phy (void);