GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix printk types in SPI flash drivers 

- use %zu instead of %zd for size_t (%zd is for ssize_t)
- use %x instead of %lx for u32
- break some long lines to avoid commit hook trouble

Change-Id: Idfad716523dbcd2a595d26317240e972b5253e8b
Signed-off-by: Stefan Reinauer <reinauer@google.com>
Reviewed-on: http://review.coreboot.org/1041
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
This commit is contained in:
Stefan Reinauer 2012-05-14 13:52:32 -07:00 committed by Stefan Reinauer
parent 872e74dda2
commit 8ea5a34833
6 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/drivers/spi/eon.c
View File

@ -86,7 +86,7 @@ static int eon_write(struct spi_flash *flash,
cmd[3] = byte_addr; cmd[3] = byte_addr;
printk(BIOS_SPEW, printk(BIOS_SPEW,
"PP: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x } chunk_len = %zd\n", "PP: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x } chunk_len = %zu\n",
buf + actual, cmd[0], cmd[1], cmd[2], cmd[3], chunk_len); buf + actual, cmd[0], cmd[1], cmd[2], cmd[3], chunk_len);
ret = spi_flash_cmd(flash->spi, CMD_EN25Q128_WREN, NULL, 0); ret = spi_flash_cmd(flash->spi, CMD_EN25Q128_WREN, NULL, 0);

7
src/drivers/spi/macronix.c
View File

@ -141,7 +141,8 @@ static int macronix_write(struct spi_flash *flash,
cmd[2] = (offset >> 8) & 0xff; cmd[2] = (offset >> 8) & 0xff;
cmd[3] = offset & 0xff; cmd[3] = offset & 0xff;
printk(BIOS_SPEW, "PP: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x } chunk_len = %zd\n", printk(BIOS_SPEW, "PP: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x }"
" chunk_len = %zu\n",
buf + actual, cmd[0], cmd[1], cmd[2], cmd[3], chunk_len); buf + actual, cmd[0], cmd[1], cmd[2], cmd[3], chunk_len);
ret = spi_flash_cmd(flash->spi, CMD_MX25XX_WREN, NULL, 0); ret = spi_flash_cmd(flash->spi, CMD_MX25XX_WREN, NULL, 0);
@ -165,8 +166,8 @@ static int macronix_write(struct spi_flash *flash,
byte_addr = 0; byte_addr = 0;
} }
printk(BIOS_INFO, "SF: Macronix: Successfully programmed %zu bytes @ 0x%lx\n", printk(BIOS_INFO, "SF: Macronix: Successfully programmed %zu bytes @"
len, offset - len); " 0x%lx\n", len, (unsigned long)(offset - len));
spi_release_bus(flash->spi); spi_release_bus(flash->spi);
return ret; return ret;

3
src/drivers/spi/spansion.c
View File

@ -162,7 +162,8 @@ static int spansion_write(struct spi_flash *flash,
cmd[2] = page_addr; cmd[2] = page_addr;
cmd[3] = byte_addr; cmd[3] = byte_addr;
printk(BIOS_SPEW, "PP: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x } chunk_len = %zd\n", printk(BIOS_SPEW, "PP: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x }"
" chunk_len = %zu\n",
buf + actual, cmd[0], cmd[1], cmd[2], cmd[3], chunk_len); buf + actual, cmd[0], cmd[1], cmd[2], cmd[3], chunk_len);
ret = spi_flash_cmd(flash->spi, CMD_S25FLXX_WREN, NULL, 0); ret = spi_flash_cmd(flash->spi, CMD_S25FLXX_WREN, NULL, 0);

2
src/drivers/spi/sst.c
View File

@ -195,7 +195,7 @@ sst_write(struct spi_flash *flash, u32 offset, size_t len, const void *buf)
done: done:
printk(BIOS_INFO, "SF: SST: program %s %zu bytes @ 0x%lx\n", printk(BIOS_INFO, "SF: SST: program %s %zu bytes @ 0x%lx\n",
ret ? "failure" : "success", len, offset - actual); ret ? "failure" : "success", len, (unsigned long)offset - actual);
spi_release_bus(flash->spi); spi_release_bus(flash->spi);
return ret; return ret;

3
src/drivers/spi/stmicro.c
View File

@ -163,7 +163,8 @@ static int stmicro_write(struct spi_flash *flash,
cmd[2] = page_addr; cmd[2] = page_addr;
cmd[3] = byte_addr; cmd[3] = byte_addr;
printk(BIOS_SPEW, "PP: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x } chunk_len = %zd\n", printk(BIOS_SPEW, "PP: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x }"
" chunk_len = %zu\n",
buf + actual, cmd[0], cmd[1], cmd[2], cmd[3], chunk_len); buf + actual, cmd[0], cmd[1], cmd[2], cmd[3], chunk_len);
ret = spi_flash_cmd(flash->spi, CMD_M25PXX_WREN, NULL, 0); ret = spi_flash_cmd(flash->spi, CMD_M25PXX_WREN, NULL, 0);

8
src/drivers/spi/winbond.c
View File

@ -130,8 +130,8 @@ static int winbond_write(struct spi_flash *flash,
cmd[1] = (offset >> 16) & 0xff; cmd[1] = (offset >> 16) & 0xff;
cmd[2] = (offset >> 8) & 0xff; cmd[2] = (offset >> 8) & 0xff;
cmd[3] = offset & 0xff; cmd[3] = offset & 0xff;
printk(BIOS_SPEW, "PP: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x } chunk_len = %ld\n", printk(BIOS_SPEW, "PP: 0x%p => cmd = { 0x%02x 0x%02x%02x%02x }"
buf + actual, " chunk_len = %zu\n", buf + actual,
cmd[0], cmd[1], cmd[2], cmd[3], chunk_len); cmd[0], cmd[1], cmd[2], cmd[3], chunk_len);
ret = spi_flash_cmd(flash->spi, CMD_W25_WREN, NULL, 0); ret = spi_flash_cmd(flash->spi, CMD_W25_WREN, NULL, 0);
@ -155,8 +155,8 @@ static int winbond_write(struct spi_flash *flash,
byte_addr = 0; byte_addr = 0;
} }
printk(BIOS_INFO, "SF: Winbond: Successfully programmed %zu bytes @ 0x%lx\n", printk(BIOS_INFO, "SF: Winbond: Successfully programmed %zu bytes @"
len, offset - len); " 0x%lx\n", len, (unsigned long)(offset - len));
ret = 0; ret = 0;
out: out: