Merge tag 'tegra-for-4.8-i2c' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra...

[cascardo/linux.git] / drivers / dma / s3c24xx-dma.c

diff --git a/drivers/dma/s3c24xx-dma.c b/drivers/dma/s3c24xx-dma.c
index d5c85e7..3c579ab 100644 (file)
--- a/drivers/dma/s3c24xx-dma.c
+++ b/drivers/dma/s3c24xx-dma.c
@@ -823,11 +823,11 @@ static struct dma_async_tx_descriptor *s3c24xx_dma_prep_memcpy(
        struct s3c24xx_sg *dsg;
        int src_mod, dest_mod;
 
-       dev_dbg(&s3cdma->pdev->dev, "prepare memcpy of %d bytes from %s\n",
+       dev_dbg(&s3cdma->pdev->dev, "prepare memcpy of %zu bytes from %s\n",
                        len, s3cchan->name);
 
        if ((len & S3C24XX_DCON_TC_MASK) != len) {
-               dev_err(&s3cdma->pdev->dev, "memcpy size %d to large\n", len);
+               dev_err(&s3cdma->pdev->dev, "memcpy size %zu to large\n", len);
                return NULL;
        }
 
@@ -1421,7 +1421,7 @@ bool s3c24xx_dma_filter(struct dma_chan *chan, void *param)
 
        s3cchan = to_s3c24xx_dma_chan(chan);
 
-       return s3cchan->id == (int)param;
+       return s3cchan->id == (uintptr_t)param;
 }
 EXPORT_SYMBOL(s3c24xx_dma_filter);