Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / drivers / media / platform / exynos4-is / fimc-is.c

diff --git a/drivers/media/platform/exynos4-is/fimc-is.c b/drivers/media/platform/exynos4-is/fimc-is.c
index 5476dce3ad293716fc940b130d1cf9f4aaa219c5..22162b2567dae446947dce4e7193cff9cfbb0940 100644 (file)
--- a/drivers/media/platform/exynos4-is/fimc-is.c
+++ b/drivers/media/platform/exynos4-is/fimc-is.c
@@ -388,7 +388,7 @@ static void fimc_is_load_firmware(const struct firmware *fw, void *context)
        mutex_lock(&is->lock);
 
        if (fw->size < FIMC_IS_FW_SIZE_MIN || fw->size > FIMC_IS_FW_SIZE_MAX) {
-               dev_err(dev, "wrong firmware size: %d\n", fw->size);
+               dev_err(dev, "wrong firmware size: %zu\n", fw->size);
                goto done;
        }
 
@@ -416,7 +416,7 @@ static void fimc_is_load_firmware(const struct firmware *fw, void *context)
 
        dev_info(dev, "loaded firmware: %s, rev. %s\n",
                 is->fw.info, is->fw.version);
-       dev_dbg(dev, "FW size: %d, paddr: %#x\n", fw->size, is->memory.paddr);
+       dev_dbg(dev, "FW size: %zu, paddr: %pad\n", fw->size, &is->memory.paddr);
 
        is->is_shared_region->chip_id = 0xe4412;
        is->is_shared_region->chip_rev_no = 1;
@@ -693,9 +693,9 @@ int fimc_is_hw_initialize(struct fimc_is *is)
                return -EIO;
        }
 
-       pr_debug("shared region: %#x, parameter region: %#x\n",
-                is->memory.paddr + FIMC_IS_SHARED_REGION_OFFSET,
-                is->is_dma_p_region);
+       pr_debug("shared region: %pad, parameter region: %pad\n",
+                &is->memory.paddr + FIMC_IS_SHARED_REGION_OFFSET,
+                &is->is_dma_p_region);
 
        is->setfile.sub_index = 0;