From: Andrew Morton Fix various borkage in debug printks. Cc: Mike Lavender Cc: David Brownell Signed-off-by: Andrew Morton --- drivers/mtd/devices/m25p80.c | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-) diff -puN drivers/mtd/devices/m25p80.c~m25-series-spi-flash-fix drivers/mtd/devices/m25p80.c --- devel/drivers/mtd/devices/m25p80.c~m25-series-spi-flash-fix 2006-01-04 20:20:46.000000000 -0800 +++ devel-akpm/drivers/mtd/devices/m25p80.c 2006-01-04 20:20:46.000000000 -0800 @@ -150,7 +150,7 @@ static int wait_till_ready(struct m25p * */ static int erase_sector(struct m25p *flash, u32 offset) { - DEBUG(MTD_DEBUG_LEVEL3, "%s: %s at 0x%08x\n", spi->dev.bus_id, + DEBUG(MTD_DEBUG_LEVEL3, "%s: %s at 0x%08x\n", flash->spi->dev.bus_id, __FUNCTION__, offset); /* Wait until finished previous write command. */ @@ -186,8 +186,9 @@ static int m25p80_erase(struct mtd_info struct m25p *flash = mtd_to_m25p(mtd); u32 addr,len; - DEBUG(MTD_DEBUG_LEVEL2, "%s: %s %s 0x%08x, len %z\n", spi->dev.bus_id, - __FUNCTION__, "at", (u32) instr->addr, instr->len); + DEBUG(MTD_DEBUG_LEVEL2, "%s: %s %s 0x%08x, len %zd\n", + flash->spi->dev.bus_id, __FUNCTION__, "at", + (u32)instr->addr, instr->len); /* sanity checks */ if (instr->addr + instr->len > flash->mtd.size) @@ -233,8 +234,9 @@ static int m25p80_read(struct mtd_info * struct spi_transfer t[2]; struct spi_message m; - DEBUG(MTD_DEBUG_LEVEL2, "%s: %s %s 0x%08x, len %z\n", spi->dev.bus_id, - __FUNCTION__, "from", (u32) from, len); + DEBUG(MTD_DEBUG_LEVEL2, "%s: %s %s 0x%08x, len %zd\n", + flash->spi->dev.bus_id, __FUNCTION__, "from", + (u32)from, len); /* sanity checks */ if (!len) @@ -297,8 +299,9 @@ static int m25p80_write(struct mtd_info struct spi_transfer t[2]; struct spi_message m; - DEBUG(MTD_DEBUG_LEVEL2, "%s: %s %s 0x%08x, len %z\n", spi->dev.bus_id, - __FUNCTION__, "to", (u32) to, len); + DEBUG(MTD_DEBUG_LEVEL2, "%s: %s %s 0x%08x, len %zd\n", + flash->spi->dev.bus_id, __FUNCTION__, "to", + (u32)to, len); if (retlen) *retlen = 0; @@ -431,7 +434,8 @@ static int __devinit m25p_probe(struct s /* FIXME some chips can identify themselves with RES * or JEDEC get-id commands. Try them ... */ - DEBUG(MTD_DEBUG_LEVEL1, "%s: no chip id\n", spi->dev.bus_id); + DEBUG(MTD_DEBUG_LEVEL1, "%s: no chip id\n", + flash->spi->dev.bus_id); return -ENODEV; } @@ -441,7 +445,7 @@ static int __devinit m25p_probe(struct s } if (i == ARRAY_SIZE(m25p_data)) { DEBUG(MTD_DEBUG_LEVEL1, "%s: unrecognized id %s\n", - spi->dev.bus_id, data->type); + flash->spi->dev.bus_id, data->type); return -ENODEV; } _