diff mbox

[U-Boot,8/9] GCC4.6: Squash warnings in ddr[123]_dimm_params.c

Message ID 1319535462-20693-9-git-send-email-marek.vasut@gmail.com
State Accepted
Headers show

Commit Message

Marek Vasut Oct. 25, 2011, 9:37 a.m. UTC
ddr1_dimm_params.c: In function 'compute_ranksize':
ddr1_dimm_params.c:44: warning: format '%08x' expects type 'unsigned int', but
argument 2 has type 'long long unsigned int'

ddr2_dimm_params.c: In function 'compute_ranksize':
ddr2_dimm_params.c:43: warning: format '%08x' expects type 'unsigned int', but
argument 2 has type 'long long unsigned int'

ddr3_dimm_params.c: In function 'compute_ranksize':
ddr3_dimm_params.c:74: warning: format '%16lx' expects type 'long unsigned int',
but argument 2 has type 'long long unsigned int'

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: Mike Frysinger <vapier@gentoo.org>
---
 arch/powerpc/cpu/mpc8xxx/ddr/ddr1_dimm_params.c |    2 +-
 arch/powerpc/cpu/mpc8xxx/ddr/ddr2_dimm_params.c |    2 +-
 arch/powerpc/cpu/mpc8xxx/ddr/ddr3_dimm_params.c |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

Comments

Kumar Gala Oct. 25, 2011, 1:16 p.m. UTC | #1
On Oct 25, 2011, at 4:37 AM, Marek Vasut wrote:

> ddr1_dimm_params.c: In function 'compute_ranksize':
> ddr1_dimm_params.c:44: warning: format '%08x' expects type 'unsigned int', but
> argument 2 has type 'long long unsigned int'
> 
> ddr2_dimm_params.c: In function 'compute_ranksize':
> ddr2_dimm_params.c:43: warning: format '%08x' expects type 'unsigned int', but
> argument 2 has type 'long long unsigned int'
> 
> ddr3_dimm_params.c: In function 'compute_ranksize':
> ddr3_dimm_params.c:74: warning: format '%16lx' expects type 'long unsigned int',
> but argument 2 has type 'long long unsigned int'
> 
> Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
> Cc: Wolfgang Denk <wd@denx.de>
> Cc: Simon Glass <sjg@chromium.org>
> Cc: Mike Frysinger <vapier@gentoo.org>
> ---
> arch/powerpc/cpu/mpc8xxx/ddr/ddr1_dimm_params.c |    2 +-
> arch/powerpc/cpu/mpc8xxx/ddr/ddr2_dimm_params.c |    2 +-
> arch/powerpc/cpu/mpc8xxx/ddr/ddr3_dimm_params.c |    2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)

Acked-by: Kumar Gala <galak@kernel.crashing.org>

[ Are individual maintainers pick these up or is Wolfgang? ]

- k
Wolfgang Denk Oct. 25, 2011, 7:28 p.m. UTC | #2
Dear Kumar Gala,

In message <0FB20304-8460-4513-8F86-3E99064C9CFB@kernel.crashing.org> you wrote:
> 
> Acked-by: Kumar Gala <galak@kernel.crashing.org>

Thanks.

> [ Are individual maintainers pick these up or is Wolfgang? ]

I feel it makes little sense to make the situation even more
complicated by routing this deluge of patches through many different
custodians.  I will pick it all.  Eventually.  Guess I need some more
time and way more beer before I dare diving into this.

Best regards,

Wolfgang Denk
Wolfgang Denk Oct. 27, 2011, 9:56 p.m. UTC | #3
Dear Marek Vasut,

In message <1319535462-20693-9-git-send-email-marek.vasut@gmail.com> you wrote:
> ddr1_dimm_params.c: In function 'compute_ranksize':
> ddr1_dimm_params.c:44: warning: format '%08x' expects type 'unsigned int', but
> argument 2 has type 'long long unsigned int'
> 
> ddr2_dimm_params.c: In function 'compute_ranksize':
> ddr2_dimm_params.c:43: warning: format '%08x' expects type 'unsigned int', but
> argument 2 has type 'long long unsigned int'
> 
> ddr3_dimm_params.c: In function 'compute_ranksize':
> ddr3_dimm_params.c:74: warning: format '%16lx' expects type 'long unsigned int',
> but argument 2 has type 'long long unsigned int'
> 
> Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
> Cc: Wolfgang Denk <wd@denx.de>
> Cc: Simon Glass <sjg@chromium.org>
> Cc: Mike Frysinger <vapier@gentoo.org>
> ---
>  arch/powerpc/cpu/mpc8xxx/ddr/ddr1_dimm_params.c |    2 +-
>  arch/powerpc/cpu/mpc8xxx/ddr/ddr2_dimm_params.c |    2 +-
>  arch/powerpc/cpu/mpc8xxx/ddr/ddr3_dimm_params.c |    2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk
diff mbox

Patch

diff --git a/arch/powerpc/cpu/mpc8xxx/ddr/ddr1_dimm_params.c b/arch/powerpc/cpu/mpc8xxx/ddr/ddr1_dimm_params.c
index 9184764..376be2f 100644
--- a/arch/powerpc/cpu/mpc8xxx/ddr/ddr1_dimm_params.c
+++ b/arch/powerpc/cpu/mpc8xxx/ddr/ddr1_dimm_params.c
@@ -41,7 +41,7 @@  compute_ranksize(unsigned int mem_type, unsigned char row_dens)
 	/* Bottom 2 bits up to the top. */
 	bsize = ((row_dens >> 2) | ((row_dens & 3) << 6));
 	bsize <<= 24ULL;
-	debug("DDR: DDR I rank density = 0x%08x\n", bsize);
+	debug("DDR: DDR I rank density = 0x%16llx\n", bsize);
 
 	return bsize;
 }
diff --git a/arch/powerpc/cpu/mpc8xxx/ddr/ddr2_dimm_params.c b/arch/powerpc/cpu/mpc8xxx/ddr/ddr2_dimm_params.c
index b565e33..f637f3d 100644
--- a/arch/powerpc/cpu/mpc8xxx/ddr/ddr2_dimm_params.c
+++ b/arch/powerpc/cpu/mpc8xxx/ddr/ddr2_dimm_params.c
@@ -40,7 +40,7 @@  compute_ranksize(unsigned int mem_type, unsigned char row_dens)
 	/* Bottom 5 bits up to the top. */
 	bsize = ((row_dens >> 5) | ((row_dens & 31) << 3));
 	bsize <<= 27ULL;
-	debug("DDR: DDR II rank density = 0x%08x\n", bsize);
+	debug("DDR: DDR II rank density = 0x%16llx\n", bsize);
 
 	return bsize;
 }
diff --git a/arch/powerpc/cpu/mpc8xxx/ddr/ddr3_dimm_params.c b/arch/powerpc/cpu/mpc8xxx/ddr/ddr3_dimm_params.c
index 838cebe..ffb503a 100644
--- a/arch/powerpc/cpu/mpc8xxx/ddr/ddr3_dimm_params.c
+++ b/arch/powerpc/cpu/mpc8xxx/ddr/ddr3_dimm_params.c
@@ -71,7 +71,7 @@  compute_ranksize(const ddr3_spd_eeprom_t *spd)
 	bsize = 1ULL << (nbit_sdram_cap_bsize - 3
 		    + nbit_primary_bus_width - nbit_sdram_width);
 
-	debug("DDR: DDR III rank density = 0x%16lx\n", bsize);
+	debug("DDR: DDR III rank density = 0x%16llx\n", bsize);
 
 	return bsize;
 }