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

Commit c4ce6d14 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB: v4l: Use v4l2_get_subdevdata instead of accessing v4l2_subdev::priv 



Replace direct access to the v4l2_subdev priv field with the inline
v4l2_get_subdevdata method.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 401ad278

drivers/media/video/mt9m001.c

+13 −13
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ static int mt9m001_init(struct i2c_client *client) 


static int mt9m001_s_stream(struct v4l2_subdev *sd, int enable)

{

	struct i2c_client *client = sd->priv;

	struct i2c_client *client = v4l2_get_subdevdata(sd);



	/* Switch to master "normal" mode or stop sensor readout */

	if (reg_write(client, MT9M001_OUTPUT_CONTROL, enable ? 2 : 0) < 0)
@@ -206,7 +206,7 @@ static unsigned long mt9m001_query_bus_param(struct soc_camera_device *icd) 


static int mt9m001_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)

{

	struct i2c_client *client = sd->priv;

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct mt9m001 *mt9m001 = to_mt9m001(client);

	struct v4l2_rect rect = a->c;

	struct soc_camera_device *icd = client->dev.platform_data;
@@ -271,7 +271,7 @@ static int mt9m001_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a) 


static int mt9m001_g_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)

{

	struct i2c_client *client = sd->priv;

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct mt9m001 *mt9m001 = to_mt9m001(client);



	a->c	= mt9m001->rect;
@@ -297,7 +297,7 @@ static int mt9m001_cropcap(struct v4l2_subdev *sd, struct v4l2_cropcap *a) 
static int mt9m001_g_fmt(struct v4l2_subdev *sd,

			 struct v4l2_mbus_framefmt *mf)

{

	struct i2c_client *client = sd->priv;

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct mt9m001 *mt9m001 = to_mt9m001(client);



	mf->width	= mt9m001->rect.width;
@@ -312,7 +312,7 @@ static int mt9m001_g_fmt(struct v4l2_subdev *sd, 
static int mt9m001_s_fmt(struct v4l2_subdev *sd,

			 struct v4l2_mbus_framefmt *mf)

{

	struct i2c_client *client = sd->priv;

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct mt9m001 *mt9m001 = to_mt9m001(client);

	struct v4l2_crop a = {

		.c = {
@@ -340,7 +340,7 @@ static int mt9m001_s_fmt(struct v4l2_subdev *sd, 
static int mt9m001_try_fmt(struct v4l2_subdev *sd,

			   struct v4l2_mbus_framefmt *mf)

{

	struct i2c_client *client = sd->priv;

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct mt9m001 *mt9m001 = to_mt9m001(client);

	const struct mt9m001_datafmt *fmt;
@@ -367,7 +367,7 @@ static int mt9m001_try_fmt(struct v4l2_subdev *sd, 
static int mt9m001_g_chip_ident(struct v4l2_subdev *sd,

				struct v4l2_dbg_chip_ident *id)

{

	struct i2c_client *client = sd->priv;

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct mt9m001 *mt9m001 = to_mt9m001(client);



	if (id->match.type != V4L2_CHIP_MATCH_I2C_ADDR)
@@ -386,7 +386,7 @@ static int mt9m001_g_chip_ident(struct v4l2_subdev *sd, 
static int mt9m001_g_register(struct v4l2_subdev *sd,

			      struct v4l2_dbg_register *reg)

{

	struct i2c_client *client = sd->priv;

	struct i2c_client *client = v4l2_get_subdevdata(sd);



	if (reg->match.type != V4L2_CHIP_MATCH_I2C_ADDR || reg->reg > 0xff)

		return -EINVAL;
@@ -406,7 +406,7 @@ static int mt9m001_g_register(struct v4l2_subdev *sd, 
static int mt9m001_s_register(struct v4l2_subdev *sd,

			      struct v4l2_dbg_register *reg)

{

	struct i2c_client *client = sd->priv;

	struct i2c_client *client = v4l2_get_subdevdata(sd);



	if (reg->match.type != V4L2_CHIP_MATCH_I2C_ADDR || reg->reg > 0xff)

		return -EINVAL;
@@ -468,7 +468,7 @@ static struct soc_camera_ops mt9m001_ops = { 


static int mt9m001_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)

{

	struct i2c_client *client = sd->priv;

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct mt9m001 *mt9m001 = to_mt9m001(client);

	int data;
@@ -494,7 +494,7 @@ static int mt9m001_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl) 


static int mt9m001_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)

{

	struct i2c_client *client = sd->priv;

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct mt9m001 *mt9m001 = to_mt9m001(client);

	struct soc_camera_device *icd = client->dev.platform_data;

	const struct v4l2_queryctrl *qctrl;
@@ -683,7 +683,7 @@ static void mt9m001_video_remove(struct soc_camera_device *icd) 


static int mt9m001_g_skip_top_lines(struct v4l2_subdev *sd, u32 *lines)

{

	struct i2c_client *client = sd->priv;

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct mt9m001 *mt9m001 = to_mt9m001(client);



	*lines = mt9m001->y_skip_top;
@@ -704,7 +704,7 @@ static struct v4l2_subdev_core_ops mt9m001_subdev_core_ops = { 
static int mt9m001_enum_fmt(struct v4l2_subdev *sd, unsigned int index,

			    enum v4l2_mbus_pixelcode *code)

{

	struct i2c_client *client = sd->priv;

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct mt9m001 *mt9m001 = to_mt9m001(client);



	if (index >= mt9m001->num_fmts)

drivers/media/video/mt9m111.c

+10 −10
Original line number Diff line number Diff line
@@ -440,7 +440,7 @@ static int mt9m111_make_rect(struct i2c_client *client, 
static int mt9m111_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)

{

	struct v4l2_rect rect = a->c;

	struct i2c_client *client = sd->priv;

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct mt9m111 *mt9m111 = to_mt9m111(client);

	int ret;
@@ -458,7 +458,7 @@ static int mt9m111_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a) 


static int mt9m111_g_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)

{

	struct i2c_client *client = sd->priv;

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct mt9m111 *mt9m111 = to_mt9m111(client);



	a->c	= mt9m111->rect;
@@ -486,7 +486,7 @@ static int mt9m111_cropcap(struct v4l2_subdev *sd, struct v4l2_cropcap *a) 
static int mt9m111_g_fmt(struct v4l2_subdev *sd,

			 struct v4l2_mbus_framefmt *mf)

{

	struct i2c_client *client = sd->priv;

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct mt9m111 *mt9m111 = to_mt9m111(client);



	mf->width	= mt9m111->rect.width;
@@ -549,7 +549,7 @@ static int mt9m111_set_pixfmt(struct i2c_client *client, 
static int mt9m111_s_fmt(struct v4l2_subdev *sd,

			 struct v4l2_mbus_framefmt *mf)

{

	struct i2c_client *client = sd->priv;

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	const struct mt9m111_datafmt *fmt;

	struct mt9m111 *mt9m111 = to_mt9m111(client);

	struct v4l2_rect rect = {
@@ -584,7 +584,7 @@ static int mt9m111_s_fmt(struct v4l2_subdev *sd, 
static int mt9m111_try_fmt(struct v4l2_subdev *sd,

			   struct v4l2_mbus_framefmt *mf)

{

	struct i2c_client *client = sd->priv;

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct mt9m111 *mt9m111 = to_mt9m111(client);

	const struct mt9m111_datafmt *fmt;

	bool bayer = mf->code == V4L2_MBUS_FMT_SBGGR8_1X8 ||
@@ -624,7 +624,7 @@ static int mt9m111_try_fmt(struct v4l2_subdev *sd, 
static int mt9m111_g_chip_ident(struct v4l2_subdev *sd,

				struct v4l2_dbg_chip_ident *id)

{

	struct i2c_client *client = sd->priv;

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct mt9m111 *mt9m111 = to_mt9m111(client);



	if (id->match.type != V4L2_CHIP_MATCH_I2C_ADDR)
@@ -643,7 +643,7 @@ static int mt9m111_g_chip_ident(struct v4l2_subdev *sd, 
static int mt9m111_g_register(struct v4l2_subdev *sd,

			      struct v4l2_dbg_register *reg)

{

	struct i2c_client *client = sd->priv;

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	int val;



	if (reg->match.type != V4L2_CHIP_MATCH_I2C_ADDR || reg->reg > 0x2ff)
@@ -664,7 +664,7 @@ static int mt9m111_g_register(struct v4l2_subdev *sd, 
static int mt9m111_s_register(struct v4l2_subdev *sd,

			      struct v4l2_dbg_register *reg)

{

	struct i2c_client *client = sd->priv;

	struct i2c_client *client = v4l2_get_subdevdata(sd);



	if (reg->match.type != V4L2_CHIP_MATCH_I2C_ADDR || reg->reg > 0x2ff)

		return -EINVAL;
@@ -812,7 +812,7 @@ static int mt9m111_set_autowhitebalance(struct i2c_client *client, int on) 


static int mt9m111_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)

{

	struct i2c_client *client = sd->priv;

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct mt9m111 *mt9m111 = to_mt9m111(client);

	int data;
@@ -855,7 +855,7 @@ static int mt9m111_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl) 


static int mt9m111_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)

{

	struct i2c_client *client = sd->priv;

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct mt9m111 *mt9m111 = to_mt9m111(client);

	const struct v4l2_queryctrl *qctrl;

	int ret;

drivers/media/video/mt9t031.c

+12 −12
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ static int mt9t031_disable(struct i2c_client *client) 


static int mt9t031_s_stream(struct v4l2_subdev *sd, int enable)

{

	struct i2c_client *client = sd->priv;

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	int ret;



	if (enable)
@@ -393,7 +393,7 @@ static int mt9t031_set_params(struct i2c_client *client, 
static int mt9t031_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)

{

	struct v4l2_rect rect = a->c;

	struct i2c_client *client = sd->priv;

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct mt9t031 *mt9t031 = to_mt9t031(client);



	rect.width = ALIGN(rect.width, 2);
@@ -410,7 +410,7 @@ static int mt9t031_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a) 


static int mt9t031_g_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)

{

	struct i2c_client *client = sd->priv;

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct mt9t031 *mt9t031 = to_mt9t031(client);



	a->c	= mt9t031->rect;
@@ -436,7 +436,7 @@ static int mt9t031_cropcap(struct v4l2_subdev *sd, struct v4l2_cropcap *a) 
static int mt9t031_g_fmt(struct v4l2_subdev *sd,

			 struct v4l2_mbus_framefmt *mf)

{

	struct i2c_client *client = sd->priv;

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct mt9t031 *mt9t031 = to_mt9t031(client);



	mf->width	= mt9t031->rect.width / mt9t031->xskip;
@@ -451,7 +451,7 @@ static int mt9t031_g_fmt(struct v4l2_subdev *sd, 
static int mt9t031_s_fmt(struct v4l2_subdev *sd,

			 struct v4l2_mbus_framefmt *mf)

{

	struct i2c_client *client = sd->priv;

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct mt9t031 *mt9t031 = to_mt9t031(client);

	u16 xskip, yskip;

	struct v4l2_rect rect = mt9t031->rect;
@@ -490,7 +490,7 @@ static int mt9t031_try_fmt(struct v4l2_subdev *sd, 
static int mt9t031_g_chip_ident(struct v4l2_subdev *sd,

				struct v4l2_dbg_chip_ident *id)

{

	struct i2c_client *client = sd->priv;

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct mt9t031 *mt9t031 = to_mt9t031(client);



	if (id->match.type != V4L2_CHIP_MATCH_I2C_ADDR)
@@ -509,7 +509,7 @@ static int mt9t031_g_chip_ident(struct v4l2_subdev *sd, 
static int mt9t031_g_register(struct v4l2_subdev *sd,

			      struct v4l2_dbg_register *reg)

{

	struct i2c_client *client = sd->priv;

	struct i2c_client *client = v4l2_get_subdevdata(sd);



	if (reg->match.type != V4L2_CHIP_MATCH_I2C_ADDR || reg->reg > 0xff)

		return -EINVAL;
@@ -528,7 +528,7 @@ static int mt9t031_g_register(struct v4l2_subdev *sd, 
static int mt9t031_s_register(struct v4l2_subdev *sd,

			      struct v4l2_dbg_register *reg)

{

	struct i2c_client *client = sd->priv;

	struct i2c_client *client = v4l2_get_subdevdata(sd);



	if (reg->match.type != V4L2_CHIP_MATCH_I2C_ADDR || reg->reg > 0xff)

		return -EINVAL;
@@ -545,7 +545,7 @@ static int mt9t031_s_register(struct v4l2_subdev *sd, 


static int mt9t031_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)

{

	struct i2c_client *client = sd->priv;

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct mt9t031 *mt9t031 = to_mt9t031(client);

	int data;
@@ -577,7 +577,7 @@ static int mt9t031_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl) 


static int mt9t031_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)

{

	struct i2c_client *client = sd->priv;

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct mt9t031 *mt9t031 = to_mt9t031(client);

	const struct v4l2_queryctrl *qctrl;

	int data;
@@ -703,7 +703,7 @@ static int mt9t031_runtime_resume(struct device *dev) 
	struct soc_camera_device *icd = container_of(vdev->parent,

		struct soc_camera_device, dev);

	struct v4l2_subdev *sd = soc_camera_to_subdev(icd);

	struct i2c_client *client = sd->priv;

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct mt9t031 *mt9t031 = to_mt9t031(client);



	int ret;
@@ -780,7 +780,7 @@ static int mt9t031_video_probe(struct i2c_client *client) 


static int mt9t031_g_skip_top_lines(struct v4l2_subdev *sd, u32 *lines)

{

	struct i2c_client *client = sd->priv;

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct mt9t031 *mt9t031 = to_mt9t031(client);



	*lines = mt9t031->y_skip_top;

drivers/media/video/mt9t112.c

+7 −7
Original line number Diff line number Diff line
@@ -804,7 +804,7 @@ static struct soc_camera_ops mt9t112_ops = { 
static int mt9t112_g_chip_ident(struct v4l2_subdev *sd,

				struct v4l2_dbg_chip_ident *id)

{

	struct i2c_client *client = sd->priv;

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct mt9t112_priv *priv = to_mt9t112(client);



	id->ident    = priv->model;
@@ -817,7 +817,7 @@ static int mt9t112_g_chip_ident(struct v4l2_subdev *sd, 
static int mt9t112_g_register(struct v4l2_subdev *sd,

			      struct v4l2_dbg_register *reg)

{

	struct i2c_client *client = sd->priv;

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	int                ret;



	reg->size = 2;
@@ -831,7 +831,7 @@ static int mt9t112_g_register(struct v4l2_subdev *sd, 
static int mt9t112_s_register(struct v4l2_subdev *sd,

			      struct v4l2_dbg_register *reg)

{

	struct i2c_client *client = sd->priv;

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	int ret;



	mt9t112_reg_write(ret, client, reg->reg, reg->val);
@@ -858,7 +858,7 @@ static struct v4l2_subdev_core_ops mt9t112_subdev_core_ops = { 
************************************************************************/

static int mt9t112_s_stream(struct v4l2_subdev *sd, int enable)

{

	struct i2c_client *client = sd->priv;

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct mt9t112_priv *priv = to_mt9t112(client);

	int ret = 0;
@@ -968,7 +968,7 @@ static int mt9t112_g_crop(struct v4l2_subdev *sd, struct v4l2_crop *a) 


static int mt9t112_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)

{

	struct i2c_client *client = sd->priv;

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct v4l2_rect *rect = &a->c;



	return mt9t112_set_params(client, rect->width, rect->height,
@@ -978,7 +978,7 @@ static int mt9t112_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a) 
static int mt9t112_g_fmt(struct v4l2_subdev *sd,

			 struct v4l2_mbus_framefmt *mf)

{

	struct i2c_client *client = sd->priv;

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct mt9t112_priv *priv = to_mt9t112(client);



	if (!priv->format) {
@@ -1000,7 +1000,7 @@ static int mt9t112_g_fmt(struct v4l2_subdev *sd, 
static int mt9t112_s_fmt(struct v4l2_subdev *sd,

			 struct v4l2_mbus_framefmt *mf)

{

	struct i2c_client *client = sd->priv;

	struct i2c_client *client = v4l2_get_subdevdata(sd);



	/* TODO: set colorspace */

	return mt9t112_set_params(client, mf->width, mf->height, mf->code);

drivers/media/video/mt9v022.c

+13 −13
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ static int mt9v022_init(struct i2c_client *client) 


static int mt9v022_s_stream(struct v4l2_subdev *sd, int enable)

{

	struct i2c_client *client = sd->priv;

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct mt9v022 *mt9v022 = to_mt9v022(client);



	if (enable)
@@ -273,7 +273,7 @@ static unsigned long mt9v022_query_bus_param(struct soc_camera_device *icd) 


static int mt9v022_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)

{

	struct i2c_client *client = sd->priv;

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct mt9v022 *mt9v022 = to_mt9v022(client);

	struct v4l2_rect rect = a->c;

	int ret;
@@ -334,7 +334,7 @@ static int mt9v022_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a) 


static int mt9v022_g_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)

{

	struct i2c_client *client = sd->priv;

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct mt9v022 *mt9v022 = to_mt9v022(client);



	a->c	= mt9v022->rect;
@@ -360,7 +360,7 @@ static int mt9v022_cropcap(struct v4l2_subdev *sd, struct v4l2_cropcap *a) 
static int mt9v022_g_fmt(struct v4l2_subdev *sd,

			 struct v4l2_mbus_framefmt *mf)

{

	struct i2c_client *client = sd->priv;

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct mt9v022 *mt9v022 = to_mt9v022(client);



	mf->width	= mt9v022->rect.width;
@@ -375,7 +375,7 @@ static int mt9v022_g_fmt(struct v4l2_subdev *sd, 
static int mt9v022_s_fmt(struct v4l2_subdev *sd,

			 struct v4l2_mbus_framefmt *mf)

{

	struct i2c_client *client = sd->priv;

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct mt9v022 *mt9v022 = to_mt9v022(client);

	struct v4l2_crop a = {

		.c = {
@@ -422,7 +422,7 @@ static int mt9v022_s_fmt(struct v4l2_subdev *sd, 
static int mt9v022_try_fmt(struct v4l2_subdev *sd,

			   struct v4l2_mbus_framefmt *mf)

{

	struct i2c_client *client = sd->priv;

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct mt9v022 *mt9v022 = to_mt9v022(client);

	const struct mt9v022_datafmt *fmt;

	int align = mf->code == V4L2_MBUS_FMT_SBGGR8_1X8 ||
@@ -448,7 +448,7 @@ static int mt9v022_try_fmt(struct v4l2_subdev *sd, 
static int mt9v022_g_chip_ident(struct v4l2_subdev *sd,

				struct v4l2_dbg_chip_ident *id)

{

	struct i2c_client *client = sd->priv;

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct mt9v022 *mt9v022 = to_mt9v022(client);



	if (id->match.type != V4L2_CHIP_MATCH_I2C_ADDR)
@@ -467,7 +467,7 @@ static int mt9v022_g_chip_ident(struct v4l2_subdev *sd, 
static int mt9v022_g_register(struct v4l2_subdev *sd,

			      struct v4l2_dbg_register *reg)

{

	struct i2c_client *client = sd->priv;

	struct i2c_client *client = v4l2_get_subdevdata(sd);



	if (reg->match.type != V4L2_CHIP_MATCH_I2C_ADDR || reg->reg > 0xff)

		return -EINVAL;
@@ -487,7 +487,7 @@ static int mt9v022_g_register(struct v4l2_subdev *sd, 
static int mt9v022_s_register(struct v4l2_subdev *sd,

			      struct v4l2_dbg_register *reg)

{

	struct i2c_client *client = sd->priv;

	struct i2c_client *client = v4l2_get_subdevdata(sd);



	if (reg->match.type != V4L2_CHIP_MATCH_I2C_ADDR || reg->reg > 0xff)

		return -EINVAL;
@@ -565,7 +565,7 @@ static struct soc_camera_ops mt9v022_ops = { 


static int mt9v022_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)

{

	struct i2c_client *client = sd->priv;

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	const struct v4l2_queryctrl *qctrl;

	unsigned long range;

	int data;
@@ -622,7 +622,7 @@ static int mt9v022_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl) 
static int mt9v022_s_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)

{

	int data;

	struct i2c_client *client = sd->priv;

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	const struct v4l2_queryctrl *qctrl;



	qctrl = soc_camera_find_qctrl(&mt9v022_ops, ctrl->id);
@@ -817,7 +817,7 @@ static void mt9v022_video_remove(struct soc_camera_device *icd) 


static int mt9v022_g_skip_top_lines(struct v4l2_subdev *sd, u32 *lines)

{

	struct i2c_client *client = sd->priv;

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct mt9v022 *mt9v022 = to_mt9v022(client);



	*lines = mt9v022->y_skip_top;
@@ -838,7 +838,7 @@ static struct v4l2_subdev_core_ops mt9v022_subdev_core_ops = { 
static int mt9v022_enum_fmt(struct v4l2_subdev *sd, unsigned int index,

			    enum v4l2_mbus_pixelcode *code)

{

	struct i2c_client *client = sd->priv;

	struct i2c_client *client = v4l2_get_subdevdata(sd);

	struct mt9v022 *mt9v022 = to_mt9v022(client);



	if (index >= mt9v022->num_fmts)