diff options
Diffstat (limited to 'drivers/dma/sh/shdma-base.c')
-rw-r--r-- | drivers/dma/sh/shdma-base.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/dma/sh/shdma-base.c b/drivers/dma/sh/shdma-base.c index 2e7b394def80..52396771acbe 100644 --- a/drivers/dma/sh/shdma-base.c +++ b/drivers/dma/sh/shdma-base.c | |||
@@ -227,7 +227,7 @@ bool shdma_chan_filter(struct dma_chan *chan, void *arg) | |||
227 | struct shdma_chan *schan = to_shdma_chan(chan); | 227 | struct shdma_chan *schan = to_shdma_chan(chan); |
228 | struct shdma_dev *sdev = to_shdma_dev(schan->dma_chan.device); | 228 | struct shdma_dev *sdev = to_shdma_dev(schan->dma_chan.device); |
229 | const struct shdma_ops *ops = sdev->ops; | 229 | const struct shdma_ops *ops = sdev->ops; |
230 | int match = (int)arg; | 230 | int match = (long)arg; |
231 | int ret; | 231 | int ret; |
232 | 232 | ||
233 | if (match < 0) | 233 | if (match < 0) |
@@ -491,8 +491,8 @@ static struct shdma_desc *shdma_add_desc(struct shdma_chan *schan, | |||
491 | } | 491 | } |
492 | 492 | ||
493 | dev_dbg(schan->dev, | 493 | dev_dbg(schan->dev, |
494 | "chaining (%u/%u)@%x -> %x with %p, cookie %d\n", | 494 | "chaining (%zu/%zu)@%pad -> %pad with %p, cookie %d\n", |
495 | copy_size, *len, *src, *dst, &new->async_tx, | 495 | copy_size, *len, src, dst, &new->async_tx, |
496 | new->async_tx.cookie); | 496 | new->async_tx.cookie); |
497 | 497 | ||
498 | new->mark = DESC_PREPARED; | 498 | new->mark = DESC_PREPARED; |
@@ -555,8 +555,8 @@ static struct dma_async_tx_descriptor *shdma_prep_sg(struct shdma_chan *schan, | |||
555 | goto err_get_desc; | 555 | goto err_get_desc; |
556 | 556 | ||
557 | do { | 557 | do { |
558 | dev_dbg(schan->dev, "Add SG #%d@%p[%d], dma %llx\n", | 558 | dev_dbg(schan->dev, "Add SG #%d@%p[%zu], dma %pad\n", |
559 | i, sg, len, (unsigned long long)sg_addr); | 559 | i, sg, len, &sg_addr); |
560 | 560 | ||
561 | if (direction == DMA_DEV_TO_MEM) | 561 | if (direction == DMA_DEV_TO_MEM) |
562 | new = shdma_add_desc(schan, flags, | 562 | new = shdma_add_desc(schan, flags, |