aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/davinci
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2009-08-10 01:49:08 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-09-18 23:19:24 -0400
commit53dacb15705901e14b03dcba27e40364fedd9d09 (patch)
treeca3b4111465aca9d58024ace0f0072ee7952c11e /drivers/media/video/davinci
parent0da2808ca27ab7f65346d4d191569c669db8f628 (diff)
V4L/DVB (12540): v4l: simplify v4l2_i2c_new_subdev and friends
Rewrite v4l2_i2c_new_subdev as a simplified version of v4l2_i2c_new_subdev_cfg and remove v4l2_i2c_new_probed_subdev and v4l2_i2c_new_probed_subdev_addr. This simplifies this API substantially. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/davinci')
-rw-r--r--drivers/media/video/davinci/vpif_display.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/davinci/vpif_display.c b/drivers/media/video/davinci/vpif_display.c
index 8ea65d794dbf..a125a452d24b 100644
--- a/drivers/media/video/davinci/vpif_display.c
+++ b/drivers/media/video/davinci/vpif_display.c
@@ -1566,10 +1566,10 @@ static __init int vpif_probe(struct platform_device *pdev)
1566 } 1566 }
1567 1567
1568 for (i = 0; i < subdev_count; i++) { 1568 for (i = 0; i < subdev_count; i++) {
1569 vpif_obj.sd[i] = v4l2_i2c_new_probed_subdev(&vpif_obj.v4l2_dev, 1569 vpif_obj.sd[i] = v4l2_i2c_new_subdev(&vpif_obj.v4l2_dev,
1570 i2c_adap, subdevdata[i].name, 1570 i2c_adap, subdevdata[i].name,
1571 subdevdata[i].name, 1571 subdevdata[i].name,
1572 &subdevdata[i].addr); 1572 0, I2C_ADDRS(subdevdata[i].addr));
1573 if (!vpif_obj.sd[i]) { 1573 if (!vpif_obj.sd[i]) {
1574 vpif_err("Error registering v4l2 subdevice\n"); 1574 vpif_err("Error registering v4l2 subdevice\n");
1575 goto probe_subdev_out; 1575 goto probe_subdev_out;