diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2009-03-30 14:47:55 (GMT) |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-04-07 00:44:25 (GMT) |
commit | 1792f68b0eb464a9bc84e7d182e2ab4d00541c8c (patch) | |
tree | 623d7e56231ef8dedc685e6b0511c63162313f7a /drivers/media/video/vino.c | |
parent | e6574f2fbecdb8af807169d345c10131ae060a88 (diff) | |
download | linux-fsl-qoriq-1792f68b0eb464a9bc84e7d182e2ab4d00541c8c.tar.xz |
V4L/DVB (11375): v4l2: use v4l2_i2c_new_probed_subdev_addr where appropriate.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/vino.c')
-rw-r--r-- | drivers/media/video/vino.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/media/video/vino.c b/drivers/media/video/vino.c index 9434375..4912696 100644 --- a/drivers/media/video/vino.c +++ b/drivers/media/video/vino.c @@ -4266,7 +4266,6 @@ static int vino_init_channel_settings(struct vino_channel_settings *vcs, static int __init vino_module_init(void) { - unsigned short addr[] = { 0, I2C_CLIENT_END }; int ret; printk(KERN_INFO "SGI VINO driver version %s\n", @@ -4336,14 +4335,12 @@ static int __init vino_module_init(void) } vino_init_stage++; - addr[0] = 0x45; vino_drvdata->decoder = - v4l2_i2c_new_probed_subdev(&vino_drvdata->v4l2_dev, - &vino_i2c_adapter, "saa7191", "saa7191", addr); - addr[0] = 0x2b; + v4l2_i2c_new_probed_subdev_addr(&vino_drvdata->v4l2_dev, + &vino_i2c_adapter, "saa7191", "saa7191", 0x45); vino_drvdata->camera = - v4l2_i2c_new_probed_subdev(&vino_drvdata->v4l2_dev, - &vino_i2c_adapter, "indycam", "indycam", addr); + v4l2_i2c_new_probed_subdev_addr(&vino_drvdata->v4l2_dev, + &vino_i2c_adapter, "indycam", "indycam", 0x2b); dprintk("init complete!\n"); |