aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSylwester Nawrocki <s.nawrocki@samsung.com>2012-08-07 03:58:35 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-09-15 09:40:58 -0400
commitd7b694d516fa409a4f0a6bae1f2434270b132645 (patch)
treee4ca3d9ed0e83da02d6efd55da0ab35ce971e2f9
parent59683b38b2e82a5d68ce11b8caa9d99ad69f7d76 (diff)
[media] m5mols: Fix cast warnings from m5mols_[set/get]_ctrl_mode
Fixes following warnings on 64-bit architectures: m5mols.h: In function 'm5mols_set_ctrl_mode': m5mols.h:326:15: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] m5mols.h: In function 'm5mols_get_ctrl_mode': m5mols.h:331:9: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] drivers/media/i2c/m5mols/m5mols_controls.c:466:2: warning: cast from pointer to integer of different size Cc: Heungjun Kim <riverful.kim@samsung.com> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/m5mols/m5mols.h4
-rw-r--r--drivers/media/video/m5mols/m5mols_controls.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/m5mols/m5mols.h b/drivers/media/video/m5mols/m5mols.h
index bb589917b65b..527e7b2965df 100644
--- a/drivers/media/video/m5mols/m5mols.h
+++ b/drivers/media/video/m5mols/m5mols.h
@@ -323,12 +323,12 @@ static inline struct v4l2_subdev *to_sd(struct v4l2_ctrl *ctrl)
323static inline void m5mols_set_ctrl_mode(struct v4l2_ctrl *ctrl, 323static inline void m5mols_set_ctrl_mode(struct v4l2_ctrl *ctrl,
324 unsigned int mode) 324 unsigned int mode)
325{ 325{
326 ctrl->priv = (void *)mode; 326 ctrl->priv = (void *)(uintptr_t)mode;
327} 327}
328 328
329static inline unsigned int m5mols_get_ctrl_mode(struct v4l2_ctrl *ctrl) 329static inline unsigned int m5mols_get_ctrl_mode(struct v4l2_ctrl *ctrl)
330{ 330{
331 return (unsigned int)ctrl->priv; 331 return (unsigned int)(uintptr_t)ctrl->priv;
332} 332}
333 333
334#endif /* M5MOLS_H */ 334#endif /* M5MOLS_H */
diff --git a/drivers/media/video/m5mols/m5mols_controls.c b/drivers/media/video/m5mols/m5mols_controls.c
index fdbc205a2969..f34429e452ab 100644
--- a/drivers/media/video/m5mols/m5mols_controls.c
+++ b/drivers/media/video/m5mols/m5mols_controls.c
@@ -463,8 +463,8 @@ static int m5mols_s_ctrl(struct v4l2_ctrl *ctrl)
463 return 0; 463 return 0;
464 } 464 }
465 465
466 v4l2_dbg(1, m5mols_debug, sd, "%s: %s, val: %d, priv: %#x\n", 466 v4l2_dbg(1, m5mols_debug, sd, "%s: %s, val: %d, priv: %p\n",
467 __func__, ctrl->name, ctrl->val, (int)ctrl->priv); 467 __func__, ctrl->name, ctrl->val, ctrl->priv);
468 468
469 if (ctrl_mode && ctrl_mode != info->mode) { 469 if (ctrl_mode && ctrl_mode != info->mode) {
470 ret = m5mols_set_mode(info, ctrl_mode); 470 ret = m5mols_set_mode(info, ctrl_mode);