From: Marek Vasut <marek.vasut@gmail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 11/18] GCC4.6: Fix warnings in pxa_mmc.c
Date: Tue, 25 Oct 2011 11:39:57 +0200 [thread overview]
Message-ID: <1319535604-20831-12-git-send-email-marek.vasut@gmail.com> (raw)
In-Reply-To: <1319535604-20831-1-git-send-email-marek.vasut@gmail.com>
pxa_mmc.c: In function 'mmc_cmd':
pxa_mmc.c:77:2: warning: format '%08x' expects type 'unsigned int', but argument
2 has type 'ulong'
pxa_mmc.c: In function 'mmc_block_read':
pxa_mmc.c:110:2: warning: format '%d' expects type 'int', but argument 4 has
type 'ulong'
pxa_mmc.c: In function 'pxa_mmc_write':
pxa_mmc.c:327:2: warning: format '%lx' expects type 'long unsigned int', but
argument 2 has type 'uchar *'
pxa_mmc.c:349:2: warning: format '%lx' expects type 'long unsigned int', but
argument 2 has type 'uchar *'
pxa_mmc.c:354:3: warning: format '%lx' expects type 'long unsigned int', but
argument 2 has type 'uchar *'
pxa_mmc.c:362:2: warning: format '%lx' expects type 'long unsigned int', but
argument 2 has type 'uchar *'
pxa_mmc.c:367:3: warning: format '%lx' expects type 'long unsigned int', but
argument 2 has type 'uchar *'
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>
---
drivers/mmc/pxa_mmc.c | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/drivers/mmc/pxa_mmc.c b/drivers/mmc/pxa_mmc.c
index 48e21ef..3c2905c 100644
--- a/drivers/mmc/pxa_mmc.c
+++ b/drivers/mmc/pxa_mmc.c
@@ -55,7 +55,7 @@ mmc_cmd(ushort cmd, ushort argh, ushort argl, ushort cmdat)
/****************************************************/
{
static uint32_t resp[4], a, b, c;
- ulong status;
+ uint32_t status;
int i;
debug("mmc_cmd %u 0x%04x 0x%04x 0x%04x\n", cmd, argh, argl,
@@ -97,7 +97,7 @@ mmc_cmd(ushort cmd, ushort argh, ushort argl, ushort cmdat)
int
/****************************************************/
-mmc_block_read(uchar * dst, ulong src, ulong len)
+mmc_block_read(uchar * dst, uint32_t src, int len)
/****************************************************/
{
ushort argh, argl;
@@ -107,7 +107,7 @@ mmc_block_read(uchar * dst, ulong src, ulong len)
return 0;
}
- debug("mmc_block_rd dst %lx src %lx len %d\n", (ulong) dst, src, len);
+ debug("mmc_block_rd dst %p src %08x len %d\n", dst, src, len);
argh = len >> 16;
argl = len & 0xffff;
@@ -298,7 +298,7 @@ pxa_mmc_read(long src, uchar * dst, int size)
int
/****************************************************/
-pxa_mmc_write(uchar * src, ulong dst, int size)
+pxa_mmc_write(uchar * src, uint32_t dst, int size)
/****************************************************/
{
ulong end, part_start, part_end, part_len, aligned_start, aligned_end;
@@ -325,14 +325,14 @@ pxa_mmc_write(uchar * src, ulong dst, int size)
/* all block aligned accesses */
debug
- ("src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n",
- src, (ulong) dst, end, part_start, part_end, aligned_start,
+ ("src %p dst %08x end %lx pstart %lx pend %lx astart %lx aend %lx\n",
+ src, dst, end, part_start, part_end, aligned_start,
aligned_end);
if (part_start) {
part_len = mmc_block_size - part_start;
debug
- ("ps src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n",
- (ulong) src, dst, end, part_start, part_end, aligned_start,
+ ("ps src %p dst %08x end %lx pstart %lx pend %lx astart %lx aend %lx\n",
+ src, dst, end, part_start, part_end, aligned_start,
aligned_end);
if ((mmc_block_read(mmc_buf, aligned_start, mmc_block_size)) <
0) {
@@ -347,26 +347,26 @@ pxa_mmc_write(uchar * src, ulong dst, int size)
src += part_len;
}
debug
- ("src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n",
- src, (ulong) dst, end, part_start, part_end, aligned_start,
+ ("src %p dst %08x end %lx pstart %lx pend %lx astart %lx aend %lx\n",
+ src, dst, end, part_start, part_end, aligned_start,
aligned_end);
for (; dst < aligned_end; src += mmc_block_size, dst += mmc_block_size) {
debug
- ("al src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n",
- src, (ulong) dst, end, part_start, part_end, aligned_start,
+ ("al src %p dst %08x end %lx pstart %lx pend %lx astart %lx aend %lx\n",
+ src, dst, end, part_start, part_end, aligned_start,
aligned_end);
if ((mmc_block_write(dst, (uchar *) src, mmc_block_size)) < 0) {
return -1;
}
}
debug
- ("src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n",
- src, (ulong) dst, end, part_start, part_end, aligned_start,
+ ("src %p dst %08x end %lx pstart %lx pend %lx astart %lx aend %lx\n",
+ src, dst, end, part_start, part_end, aligned_start,
aligned_end);
if (part_end && dst < end) {
debug
- ("pe src %lx dst %lx end %lx pstart %lx pend %lx astart %lx aend %lx\n",
- src, (ulong) dst, end, part_start, part_end, aligned_start,
+ ("pe src %p dst %08x end %lx pstart %lx pend %lx astart %lx aend %lx\n",
+ src, dst, end, part_start, part_end, aligned_start,
aligned_end);
if ((mmc_block_read(mmc_buf, aligned_end, mmc_block_size)) < 0) {
return -1;
--
1.7.6.3
next prev parent reply other threads:[~2011-10-25 9:39 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-25 9:39 [U-Boot] [PATCH 00/18] CLEANUP: Cleanup of drivers/ directory Marek Vasut
2011-10-25 9:39 ` [U-Boot] [PATCH 01/18] GCC4.6: Squash warning in cfb_console.c Marek Vasut
2011-10-27 21:59 ` Wolfgang Denk
2011-10-25 9:39 ` [U-Boot] [PATCH 02/18] GCC4.6: Squash warning in cfi_flash.c Marek Vasut
2011-10-27 21:59 ` Wolfgang Denk
2011-10-25 9:39 ` [U-Boot] [PATCH 03/18] GCC4.6: Squash warning in jedec_flash.c Marek Vasut
2011-10-27 21:59 ` Wolfgang Denk
2011-10-25 9:39 ` [U-Boot] [PATCH 04/18] GCC4.6: Squash warnings in 4xx_enet.c Marek Vasut
2011-10-27 21:59 ` Wolfgang Denk
2011-10-25 9:39 ` [U-Boot] [PATCH 05/18] GCC4.6: Squash warnings in ahci.c Marek Vasut
2011-10-27 21:59 ` Wolfgang Denk
2011-10-25 9:39 ` [U-Boot] [PATCH 06/18] GCC4.6: Squash warnings in fsl_espi.c Marek Vasut
2011-10-27 21:59 ` Wolfgang Denk
2011-10-25 9:39 ` [U-Boot] [PATCH 07/18] GCC4.6: Squash warnings in fsl_pci_init.c Marek Vasut
2011-10-27 21:59 ` Wolfgang Denk
2011-10-25 9:39 ` [U-Boot] [PATCH 08/18] GCC4.6: Squash warnings in sata_sil3114.c Marek Vasut
2011-10-27 22:00 ` Wolfgang Denk
2011-10-25 9:39 ` [U-Boot] [PATCH 09/18] GCC4.6: Squash warnings in tqm8xx_pcmcia.c Marek Vasut
2011-10-27 22:00 ` Wolfgang Denk
2011-10-25 9:39 ` [U-Boot] [PATCH 10/18] GCC4.6: Squash error in pcmcia/i82365.c Marek Vasut
2011-10-27 22:00 ` Wolfgang Denk
2011-10-25 9:39 ` Marek Vasut [this message]
2011-10-27 22:00 ` [U-Boot] [PATCH 11/18] GCC4.6: Fix warnings in pxa_mmc.c Wolfgang Denk
2011-10-25 9:39 ` [U-Boot] [PATCH 12/18] GCC4.6: Squash warnings in smsc95xx.c Marek Vasut
2011-10-27 22:00 ` Wolfgang Denk
2011-10-30 20:37 ` Mike Frysinger
2011-10-30 20:48 ` Marek Vasut
2011-10-30 22:03 ` Wolfgang Denk
2011-10-30 22:19 ` Marek Vasut
2011-10-30 22:59 ` Mike Frysinger
2011-10-30 23:45 ` Marek Vasut
2011-10-31 0:19 ` Mike Frysinger
2011-10-25 9:39 ` [U-Boot] [PATCH 13/18] GCC4.6: Squash warnings in kirkwood_spi.c Marek Vasut
2011-10-27 22:00 ` Wolfgang Denk
2011-10-25 9:40 ` [U-Boot] [PATCH 14/18] GCC4.6: Squash warnings in lattice.c Marek Vasut
2011-10-27 22:00 ` Wolfgang Denk
2011-10-25 9:40 ` [U-Boot] [PATCH 15/18] GCC4.6: Squash warnings in ks8695eth.c Marek Vasut
2011-10-27 22:00 ` Wolfgang Denk
2011-10-25 9:40 ` [U-Boot] [PATCH 16/18] GCC4.6: Squash warning in bus_vcxk.c Marek Vasut
2011-10-27 22:00 ` Wolfgang Denk
2011-10-25 9:40 ` [U-Boot] [PATCH 17/18] GCC4.6: Squash warnings in fec_mxc.c Marek Vasut
2011-10-27 22:00 ` Wolfgang Denk
2011-10-25 9:40 ` [U-Boot] [PATCH 18/18] GCC4.6: Use debug() instead of debugX() in s3c24xx_nand.c Marek Vasut
2011-10-27 22:01 ` Wolfgang Denk
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1319535604-20831-12-git-send-email-marek.vasut@gmail.com \
--to=marek.vasut@gmail.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox