Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-12-03 01:50:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

GCC4.6: Squash subsequent warnings in usb_storage.c

Browse source 
usb_storage.c: In function ‘us_one_transfer’:
usb_storage.c:377:7: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 2 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:389:6: warning: format ‘%d’ expects argument of type ‘int’, but
argument 2 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:394:6: warning: format ‘%d’ expects argument of type ‘int’, but
argument 2 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_BBB_reset’:
usb_storage.c:442:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:448:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:454:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_CB_reset’:
usb_storage.c:482:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_CB_comdat’:
usb_storage.c:572:3: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:584:4: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_BBB_transport’:
usb_storage.c:782:3: warning: format ‘%d’ expects argument of type ‘int’, but
argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c: In function ‘usb_stor_CB_transport’:
usb_storage.c:807:2: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 3 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:830:3: warning: format ‘%X’ expects argument of type ‘unsigned
int’, but argument 2 has type ‘long unsigned int’ [-Wformat]
usb_storage.c:857:3: warning: format ‘%d’ expects argument of type ‘int’, but
argument 2 has type ‘long unsigned int’ [-Wformat]

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>
Cc: Remy Bohmer <linux@bohmer.net>
This commit is contained in:
Marek Vasut 2011-10-25 11:39:17 +02:00 committed by Wolfgang Denk
parent 86bd3ff8fd
commit 4b210e8bcf
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
common/usb_storage.c
View file

@ -373,7 +373,7 @@ static int us_one_transfer(struct us_data *us, int pipe, char *buf, int length)
usb_clear_halt(us->pusb_dev, pipe); usb_clear_halt(us->pusb_dev, pipe);
us->pusb_dev->status = stat; us->pusb_dev->status = stat;
if (this_xfer == partial) { if (this_xfer == partial) {
USB_STOR_PRINTF("bulk transferred with error %X, but data ok\n", us->pusb_dev->status); USB_STOR_PRINTF("bulk transferred with error %lX, but data ok\n", us->pusb_dev->status);
return 0; return 0;
} }
else else
@ -385,12 +385,12 @@ static int us_one_transfer(struct us_data *us, int pipe, char *buf, int length)
} }
USB_STOR_PRINTF("bulk transferred with error"); USB_STOR_PRINTF("bulk transferred with error");
if (this_xfer == partial) { if (this_xfer == partial) {
USB_STOR_PRINTF(" %d, but data ok\n", USB_STOR_PRINTF(" %ld, but data ok\n",
us->pusb_dev->status); us->pusb_dev->status);
return 0; return 0;
} }
/* if our try counter reaches 0, bail out */ /* if our try counter reaches 0, bail out */
USB_STOR_PRINTF(" %d, data %d\n", USB_STOR_PRINTF(" %ld, data %d\n",
us->pusb_dev->status, partial); us->pusb_dev->status, partial);
if (!maxtry--) if (!maxtry--)
return result; return result;
@ -438,19 +438,19 @@ static int usb_stor_BBB_reset(struct us_data *us)
/* long wait for reset */ /* long wait for reset */
wait_ms(150); wait_ms(150);
USB_STOR_PRINTF("BBB_reset result %d: status %X reset\n", result, USB_STOR_PRINTF("BBB_reset result %d: status %lX reset\n", result,
us->pusb_dev->status); us->pusb_dev->status);
pipe = usb_rcvbulkpipe(us->pusb_dev, us->ep_in); pipe = usb_rcvbulkpipe(us->pusb_dev, us->ep_in);
result = usb_clear_halt(us->pusb_dev, pipe); result = usb_clear_halt(us->pusb_dev, pipe);
/* long wait for reset */ /* long wait for reset */
wait_ms(150); wait_ms(150);
USB_STOR_PRINTF("BBB_reset result %d: status %X clearing IN endpoint\n", USB_STOR_PRINTF("BBB_reset result %d: status %lX clearing IN endpoint\n",
result, us->pusb_dev->status); result, us->pusb_dev->status);
/* long wait for reset */ /* long wait for reset */
pipe = usb_sndbulkpipe(us->pusb_dev, us->ep_out); pipe = usb_sndbulkpipe(us->pusb_dev, us->ep_out);
result = usb_clear_halt(us->pusb_dev, pipe); result = usb_clear_halt(us->pusb_dev, pipe);
wait_ms(150); wait_ms(150);
USB_STOR_PRINTF("BBB_reset result %d: status %X" USB_STOR_PRINTF("BBB_reset result %d: status %lX"
" clearing OUT endpoint\n", result, " clearing OUT endpoint\n", result,
us->pusb_dev->status); us->pusb_dev->status);
USB_STOR_PRINTF("BBB_reset done\n"); USB_STOR_PRINTF("BBB_reset done\n");
@ -478,7 +478,7 @@ static int usb_stor_CB_reset(struct us_data *us)
/* long wait for reset */ /* long wait for reset */
wait_ms(1500); wait_ms(1500);
USB_STOR_PRINTF("CB_reset result %d: status %X" USB_STOR_PRINTF("CB_reset result %d: status %lX"
" clearing endpoint halt\n", result, " clearing endpoint halt\n", result,
us->pusb_dev->status); us->pusb_dev->status);
usb_clear_halt(us->pusb_dev, usb_rcvbulkpipe(us->pusb_dev, us->ep_in)); usb_clear_halt(us->pusb_dev, usb_rcvbulkpipe(us->pusb_dev, us->ep_in));
@ -569,7 +569,7 @@ int usb_stor_CB_comdat(ccb *srb, struct us_data *us)
srb->cmd, srb->cmdlen, srb->cmd, srb->cmdlen,
USB_CNTL_TIMEOUT * 5); USB_CNTL_TIMEOUT * 5);
USB_STOR_PRINTF("CB_transport: control msg returned %d," USB_STOR_PRINTF("CB_transport: control msg returned %d,"
" status %X\n", result, us->pusb_dev->status); " status %lX\n", result, us->pusb_dev->status);
/* check the return code for the command */ /* check the return code for the command */
if (result < 0) { if (result < 0) {
if (us->pusb_dev->status & USB_ST_STALLED) { if (us->pusb_dev->status & USB_ST_STALLED) {
@ -581,7 +581,7 @@ int usb_stor_CB_comdat(ccb *srb, struct us_data *us)
us->pusb_dev->status = status; us->pusb_dev->status = status;
} }
USB_STOR_PRINTF(" error during command %02X" USB_STOR_PRINTF(" error during command %02X"
" Stat = %X\n", srb->cmd[0], " Stat = %lX\n", srb->cmd[0],
us->pusb_dev->status); us->pusb_dev->status);
return result; return result;
} }
@ -778,7 +778,7 @@ again:
usb_stor_BBB_reset(us); usb_stor_BBB_reset(us);
return USB_STOR_TRANSPORT_FAILED; return USB_STOR_TRANSPORT_FAILED;
} else if (data_actlen > srb->datalen) { } else if (data_actlen > srb->datalen) {
USB_STOR_PRINTF("transferred %dB instead of %dB\n", USB_STOR_PRINTF("transferred %dB instead of %ldB\n",
data_actlen, srb->datalen); data_actlen, srb->datalen);
return USB_STOR_TRANSPORT_FAILED; return USB_STOR_TRANSPORT_FAILED;
} else if (csw.bCSWStatus == CSWSTATUS_FAILED) { } else if (csw.bCSWStatus == CSWSTATUS_FAILED) {
@ -803,7 +803,7 @@ int usb_stor_CB_transport(ccb *srb, struct us_data *us)
/* issue the command */ /* issue the command */
do_retry: do_retry:
result = usb_stor_CB_comdat(srb, us); result = usb_stor_CB_comdat(srb, us);
USB_STOR_PRINTF("command / Data returned %d, status %X\n", USB_STOR_PRINTF("command / Data returned %d, status %lX\n",
result, us->pusb_dev->status); result, us->pusb_dev->status);
/* if this is an CBI Protocol, get IRQ */ /* if this is an CBI Protocol, get IRQ */
if (us->protocol == US_PR_CBI) { if (us->protocol == US_PR_CBI) {
@ -826,7 +826,7 @@ do_retry:
/* do we have to issue an auto request? */ /* do we have to issue an auto request? */
/* HERE we have to check the result */ /* HERE we have to check the result */
if ((result < 0) && !(us->pusb_dev->status & USB_ST_STALLED)) { if ((result < 0) && !(us->pusb_dev->status & USB_ST_STALLED)) {
USB_STOR_PRINTF("ERROR %X\n", us->pusb_dev->status); USB_STOR_PRINTF("ERROR %lX\n", us->pusb_dev->status);
us->transport_reset(us); us->transport_reset(us);
return USB_STOR_TRANSPORT_ERROR; return USB_STOR_TRANSPORT_ERROR;
} }
@ -853,7 +853,7 @@ do_retry:
status = usb_stor_CBI_get_status(psrb, us); status = usb_stor_CBI_get_status(psrb, us);
if ((result < 0) && !(us->pusb_dev->status & USB_ST_STALLED)) { if ((result < 0) && !(us->pusb_dev->status & USB_ST_STALLED)) {
USB_STOR_PRINTF(" AUTO REQUEST ERROR %d\n", USB_STOR_PRINTF(" AUTO REQUEST ERROR %ld\n",
us->pusb_dev->status); us->pusb_dev->status);
return USB_STOR_TRANSPORT_ERROR; return USB_STOR_TRANSPORT_ERROR;
} }