openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] media: i2c: ths7303: remove unnecessary function ths7303_setup() 

the ths7303_setup() was doing the same thing as ths7303_setval()
except that ths7303_setval() sets it to some particular mode.
This patch removes ths7303_setup() function and calls ths7303_setval()
in the probe setting the device to 480I_576I filter mode in the probe.

Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Lad, Prabhakar 2013-05-25 13:39:35 -03:00 committed by Mauro Carvalho Chehab
parent d97ada97ae
commit 8524ce558a
1 changed files with 4 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/media/i2c/ths7303.c
View File

@ -349,30 +349,6 @@ static const struct v4l2_subdev_ops ths7303_ops = {
.video = &ths7303_video_ops, .video = &ths7303_video_ops,
}; };
static int ths7303_setup(struct v4l2_subdev *sd)
{
struct ths7303_state *state = to_state(sd);
struct ths7303_platform_data *pdata = &state->pdata;
int ret;
u8 mask;
mask = 0xf8;
ret = ths7303_write(sd, THS7303_CHANNEL_1, pdata->ch_1 & mask);
if (ret)
return ret;
ret = ths7303_write(sd, THS7303_CHANNEL_2, pdata->ch_2 & mask);
if (ret)
return ret;
ret = ths7303_write(sd, THS7303_CHANNEL_3, pdata->ch_3 & mask);
if (ret)
return ret;
return 0;
}
static int ths7303_probe(struct i2c_client *client, static int ths7303_probe(struct i2c_client *client,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
@ -402,9 +378,10 @@ static int ths7303_probe(struct i2c_client *client,
/* store the driver data to differntiate the chip */ /* store the driver data to differntiate the chip */
state->driver_data = (int)id->driver_data; state->driver_data = (int)id->driver_data;
if (ths7303_setup(sd) < 0) { /* set to default 480I_576I filter mode */
v4l_err(client, "init failed\n"); if (ths7303_setval(sd, THS7303_FILTER_MODE_480I_576I) < 0) {
return -EIO; v4l_err(client, "Setting to 480I_576I filter mode failed!\n");
return -EINVAL;
} }
return 0; return 0;