Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d7b694d5 authored by Sylwester Nawrocki's avatar Sylwester Nawrocki Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 59683b38

drivers/media/video/m5mols/m5mols.h

+2 −2
Original line number Diff line number Diff line
@@ -323,12 +323,12 @@ static inline struct v4l2_subdev *to_sd(struct v4l2_ctrl *ctrl) 
static inline void m5mols_set_ctrl_mode(struct v4l2_ctrl *ctrl,

					unsigned int mode)

{

	ctrl->priv = (void *)mode;

	ctrl->priv = (void *)(uintptr_t)mode;

}



static inline unsigned int m5mols_get_ctrl_mode(struct v4l2_ctrl *ctrl)

{

	return (unsigned int)ctrl->priv;

	return (unsigned int)(uintptr_t)ctrl->priv;

}



#endif	/* M5MOLS_H */

drivers/media/video/m5mols/m5mols_controls.c

+2 −2
Original line number Diff line number Diff line
@@ -463,8 +463,8 @@ static int m5mols_s_ctrl(struct v4l2_ctrl *ctrl) 
		return 0;

	}



	v4l2_dbg(1, m5mols_debug, sd, "%s: %s, val: %d, priv: %#x\n",

		 __func__, ctrl->name, ctrl->val, (int)ctrl->priv);

	v4l2_dbg(1, m5mols_debug, sd, "%s: %s, val: %d, priv: %p\n",

		 __func__, ctrl->name, ctrl->val, ctrl->priv);



	if (ctrl_mode && ctrl_mode != info->mode) {

		ret = m5mols_set_mode(info, ctrl_mode);