aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2014-06-11 17:30:03 -0400
committerUlf Hansson <ulf.hansson@linaro.org>2014-06-12 04:38:50 -0400
commit13fe0ec37ab7efc11cabb5b5cc112aa029712f7c (patch)
treea8c14c8897be432e2e69ba2dda08598a2f86e1df
parent5c02c392cd2320e8d612376d6b72b6548a680923 (diff)
mmc: usdhi6rol0: fix compiler warnings
Fix a number of wrong print formats. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
-rw-r--r--drivers/mmc/host/usdhi6rol0.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/mmc/host/usdhi6rol0.c b/drivers/mmc/host/usdhi6rol0.c
index eb2bbbef19c6..f0a39eb049af 100644
--- a/drivers/mmc/host/usdhi6rol0.c
+++ b/drivers/mmc/host/usdhi6rol0.c
@@ -357,7 +357,7 @@ static void *usdhi6_sg_map(struct usdhi6_host *host)
357 357
358 WARN(host->pg.page, "%p not properly unmapped!\n", host->pg.page); 358 WARN(host->pg.page, "%p not properly unmapped!\n", host->pg.page);
359 if (WARN(sg_dma_len(sg) % data->blksz, 359 if (WARN(sg_dma_len(sg) % data->blksz,
360 "SG size %zd isn't a multiple of block size %zd\n", 360 "SG size %u isn't a multiple of block size %u\n",
361 sg_dma_len(sg), data->blksz)) 361 sg_dma_len(sg), data->blksz))
362 return NULL; 362 return NULL;
363 363
@@ -459,7 +459,7 @@ static void usdhi6_sg_advance(struct usdhi6_host *host)
459 done = (host->page_idx << PAGE_SHIFT) + host->offset; 459 done = (host->page_idx << PAGE_SHIFT) + host->offset;
460 total = host->sg->offset + sg_dma_len(host->sg); 460 total = host->sg->offset + sg_dma_len(host->sg);
461 461
462 dev_dbg(mmc_dev(host->mmc), "%s(): %zu of %zu @ %u\n", __func__, 462 dev_dbg(mmc_dev(host->mmc), "%s(): %zu of %zu @ %zu\n", __func__,
463 done, total, host->offset); 463 done, total, host->offset);
464 464
465 if (done < total && host->offset) { 465 if (done < total && host->offset) {
@@ -489,7 +489,7 @@ static void usdhi6_sg_advance(struct usdhi6_host *host)
489 host->sg = next; 489 host->sg = next;
490 490
491 if (WARN(next && sg_dma_len(next) % data->blksz, 491 if (WARN(next && sg_dma_len(next) % data->blksz,
492 "SG size %zd isn't a multiple of block size %zd\n", 492 "SG size %u isn't a multiple of block size %u\n",
493 sg_dma_len(next), data->blksz)) 493 sg_dma_len(next), data->blksz))
494 data->error = -EINVAL; 494 data->error = -EINVAL;
495 495
@@ -896,7 +896,7 @@ static void usdhi6_request_done(struct usdhi6_host *host)
896 struct mmc_data *data = mrq->data; 896 struct mmc_data *data = mrq->data;
897 897
898 if (WARN(host->pg.page || host->head_pg.page, 898 if (WARN(host->pg.page || host->head_pg.page,
899 "Page %p or %p not unmapped: wait %u, CMD%d(%c) @ +0x%x %ux%u in SG%u!\n", 899 "Page %p or %p not unmapped: wait %u, CMD%d(%c) @ +0x%zx %ux%u in SG%u!\n",
900 host->pg.page, host->head_pg.page, host->wait, mrq->cmd->opcode, 900 host->pg.page, host->head_pg.page, host->wait, mrq->cmd->opcode,
901 data ? (data->flags & MMC_DATA_READ ? 'R' : 'W') : '-', 901 data ? (data->flags & MMC_DATA_READ ? 'R' : 'W') : '-',
902 data ? host->offset : 0, data ? data->blocks : 0, 902 data ? host->offset : 0, data ? data->blocks : 0,
@@ -1666,7 +1666,7 @@ static void usdhi6_timeout_work(struct work_struct *work)
1666 case USDHI6_WAIT_FOR_READ: 1666 case USDHI6_WAIT_FOR_READ:
1667 case USDHI6_WAIT_FOR_WRITE: 1667 case USDHI6_WAIT_FOR_WRITE:
1668 dev_dbg(mmc_dev(host->mmc), 1668 dev_dbg(mmc_dev(host->mmc),
1669 "%c: page #%u @ +0x%x %ux%u in SG%u. Current SG %u bytes @ %u\n", 1669 "%c: page #%u @ +0x%zx %ux%u in SG%u. Current SG %u bytes @ %u\n",
1670 data->flags & MMC_DATA_READ ? 'R' : 'W', host->page_idx, 1670 data->flags & MMC_DATA_READ ? 'R' : 'W', host->page_idx,
1671 host->offset, data->blocks, data->blksz, data->sg_len, 1671 host->offset, data->blocks, data->blksz, data->sg_len,
1672 sg_dma_len(host->sg), host->sg->offset); 1672 sg_dma_len(host->sg), host->sg->offset);