diff options
author | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2014-09-24 21:08:41 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2014-09-26 05:51:01 -0400 |
commit | 7d4020c3c400260ea0601a74eace1cb071f01dd3 (patch) | |
tree | bee7e2444b64066a248ab2cee641f34cfde87764 /drivers/media/platform/exynos4-is | |
parent | 7983b773bad92fcc790152fe6db616644db1dfda (diff) |
[media] exynos4-is: fix some warnings when compiling on arm64
Got those warnings when compiling with gcc 4.9.1 for arm64:
drivers/media/platform/exynos4-is/fimc-isp-video.c: In function ‘isp_video_capture_buffer_queue’:
drivers/media/platform/exynos4-is/fimc-isp-video.c:221:4: warning: format ‘%x’ expects argument of type ‘unsigned int’, but argument 7 has type ‘dma_addr_t’ [-Wformat=]
isp_dbg(2, &video->ve.vdev,
^
drivers/media/platform/exynos4-is/fimc-is.c: In function ‘fimc_is_load_firmware’:
drivers/media/platform/exynos4-is/fimc-is.c:391:3: warning: format ‘%d’ expects argument of type ‘int’, but argument 3 has type ‘size_t’ [-Wformat=]
dev_err(dev, "wrong firmware size: %d\n", fw->size);
^
In file included from include/linux/printk.h:260:0,
from include/linux/kernel.h:13,
from include/linux/kernfs.h:10,
from include/linux/sysfs.h:15,
from include/linux/kobject.h:21,
from include/linux/device.h:17,
from drivers/media/platform/exynos4-is/fimc-is.c:15:
include/linux/dynamic_debug.h:64:16: warning: format ‘%d’ expects argument of type ‘int’, but argument 4 has type ‘size_t’ [-Wformat=]
static struct _ddebug __aligned(8) \
^
include/linux/dynamic_debug.h:84:2: note: in expansion of macro ‘DEFINE_DYNAMIC_DEBUG_METADATA’
DEFINE_DYNAMIC_DEBUG_METADATA(descriptor, fmt); \
^
include/linux/device.h:1106:2: note: in expansion of macro ‘dynamic_dev_dbg’
dynamic_dev_dbg(dev, format, ##__VA_ARGS__); \
^
drivers/media/platform/exynos4-is/fimc-is.c:419:2: note: in expansion of macro ‘dev_dbg’
dev_dbg(dev, "FW size: %d, paddr: %#x\n", fw->size, is->memory.paddr);
^
include/linux/dynamic_debug.h:64:16: warning: format ‘%x’ expects argument of type ‘unsigned int’, but argument 5 has type ‘dma_addr_t’ [-Wformat=]
static struct _ddebug __aligned(8) \
^
include/linux/dynamic_debug.h:84:2: note: in expansion of macro ‘DEFINE_DYNAMIC_DEBUG_METADATA’
DEFINE_DYNAMIC_DEBUG_METADATA(descriptor, fmt); \
^
include/linux/device.h:1106:2: note: in expansion of macro ‘dynamic_dev_dbg’
dynamic_dev_dbg(dev, format, ##__VA_ARGS__); \
^
drivers/media/platform/exynos4-is/fimc-is.c:419:2: note: in expansion of macro ‘dev_dbg’
dev_dbg(dev, "FW size: %d, paddr: %#x\n", fw->size, is->memory.paddr);
^
drivers/media/platform/exynos4-is/fimc-is.c: In function ‘fimc_is_hw_initialize’:
include/linux/dynamic_debug.h:64:16: warning: format ‘%x’ expects argument of type ‘unsigned int’, but argument 5 has type ‘dma_addr_t’ [-Wformat=]
static struct _ddebug __aligned(8) \
^
include/linux/dynamic_debug.h:76:2: note: in expansion of macro ‘DEFINE_DYNAMIC_DEBUG_METADATA’
DEFINE_DYNAMIC_DEBUG_METADATA(descriptor, fmt); \
^
include/linux/printk.h:266:2: note: in expansion of macro ‘dynamic_pr_debug’
dynamic_pr_debug(fmt, ##__VA_ARGS__)
^
drivers/media/platform/exynos4-is/fimc-is.c:696:2: note: in expansion of macro ‘pr_debug’
pr_debug("shared region: %#x, parameter region: %#x\n",
^
include/linux/dynamic_debug.h:64:16: warning: format ‘%x’ expects argument of type ‘unsigned int’, but argument 6 has type ‘dma_addr_t’ [-Wformat=]
static struct _ddebug __aligned(8) \
^
include/linux/dynamic_debug.h:76:2: note: in expansion of macro ‘DEFINE_DYNAMIC_DEBUG_METADATA’
DEFINE_DYNAMIC_DEBUG_METADATA(descriptor, fmt); \
^
include/linux/printk.h:266:2: note: in expansion of macro ‘dynamic_pr_debug’
dynamic_pr_debug(fmt, ##__VA_ARGS__)
^
drivers/media/platform/exynos4-is/fimc-is.c:696:2: note: in expansion of macro ‘pr_debug’
pr_debug("shared region: %#x, parameter region: %#x\n",
^
Acked-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/platform/exynos4-is')
-rw-r--r-- | drivers/media/platform/exynos4-is/fimc-is.c | 10 | ||||
-rw-r--r-- | drivers/media/platform/exynos4-is/fimc-isp-video.c | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/drivers/media/platform/exynos4-is/fimc-is.c b/drivers/media/platform/exynos4-is/fimc-is.c index 5476dce3ad29..22162b2567da 100644 --- 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) | |||
388 | mutex_lock(&is->lock); | 388 | mutex_lock(&is->lock); |
389 | 389 | ||
390 | if (fw->size < FIMC_IS_FW_SIZE_MIN || fw->size > FIMC_IS_FW_SIZE_MAX) { | 390 | if (fw->size < FIMC_IS_FW_SIZE_MIN || fw->size > FIMC_IS_FW_SIZE_MAX) { |
391 | dev_err(dev, "wrong firmware size: %d\n", fw->size); | 391 | dev_err(dev, "wrong firmware size: %zu\n", fw->size); |
392 | goto done; | 392 | goto done; |
393 | } | 393 | } |
394 | 394 | ||
@@ -416,7 +416,7 @@ static void fimc_is_load_firmware(const struct firmware *fw, void *context) | |||
416 | 416 | ||
417 | dev_info(dev, "loaded firmware: %s, rev. %s\n", | 417 | dev_info(dev, "loaded firmware: %s, rev. %s\n", |
418 | is->fw.info, is->fw.version); | 418 | is->fw.info, is->fw.version); |
419 | dev_dbg(dev, "FW size: %d, paddr: %#x\n", fw->size, is->memory.paddr); | 419 | dev_dbg(dev, "FW size: %zu, paddr: %pad\n", fw->size, &is->memory.paddr); |
420 | 420 | ||
421 | is->is_shared_region->chip_id = 0xe4412; | 421 | is->is_shared_region->chip_id = 0xe4412; |
422 | is->is_shared_region->chip_rev_no = 1; | 422 | is->is_shared_region->chip_rev_no = 1; |
@@ -693,9 +693,9 @@ int fimc_is_hw_initialize(struct fimc_is *is) | |||
693 | return -EIO; | 693 | return -EIO; |
694 | } | 694 | } |
695 | 695 | ||
696 | pr_debug("shared region: %#x, parameter region: %#x\n", | 696 | pr_debug("shared region: %pad, parameter region: %pad\n", |
697 | is->memory.paddr + FIMC_IS_SHARED_REGION_OFFSET, | 697 | &is->memory.paddr + FIMC_IS_SHARED_REGION_OFFSET, |
698 | is->is_dma_p_region); | 698 | &is->is_dma_p_region); |
699 | 699 | ||
700 | is->setfile.sub_index = 0; | 700 | is->setfile.sub_index = 0; |
701 | 701 | ||
diff --git a/drivers/media/platform/exynos4-is/fimc-isp-video.c b/drivers/media/platform/exynos4-is/fimc-isp-video.c index 9d8d885558e5..76b6b4d14616 100644 --- a/drivers/media/platform/exynos4-is/fimc-isp-video.c +++ b/drivers/media/platform/exynos4-is/fimc-isp-video.c | |||
@@ -219,9 +219,9 @@ static void isp_video_capture_buffer_queue(struct vb2_buffer *vb) | |||
219 | ivb->dma_addr[i]; | 219 | ivb->dma_addr[i]; |
220 | 220 | ||
221 | isp_dbg(2, &video->ve.vdev, | 221 | isp_dbg(2, &video->ve.vdev, |
222 | "dma_buf %d (%d/%d/%d) addr: %#x\n", | 222 | "dma_buf %pad (%d/%d/%d) addr: %pad\n", |
223 | buf_index, ivb->index, i, vb->v4l2_buf.index, | 223 | &buf_index, ivb->index, i, vb->v4l2_buf.index, |
224 | ivb->dma_addr[i]); | 224 | &ivb->dma_addr[i]); |
225 | } | 225 | } |
226 | 226 | ||
227 | if (++video->buf_count < video->reqbufs_count) | 227 | if (++video->buf_count < video->reqbufs_count) |