diff options
author | Devin Heitmueller <dheitmueller@linuxtv.org> | 2009-03-11 02:01:04 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-30 11:43:27 -0400 |
commit | b14667f32ad0f85f986847ef65f9f3d12a44b71a (patch) | |
tree | bb5e0a2867f9d16e37d2a27f9a5d3b7efe122f5f /drivers/media/video/au0828/au0828-core.c | |
parent | 2eaf396020555973cad7aa5b517c2418eccbca50 (diff) |
V4L/DVB (11080): au0828: Convert to use v4l2_device/subdev framework
Convert over to using the new subdev framework for the au0828 bridge. This
includes using the new i2c probing mechanism.
Signed-off-by: Devin Heitmueller <dheitmueller@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/au0828/au0828-core.c')
-rw-r--r-- | drivers/media/video/au0828/au0828-core.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/drivers/media/video/au0828/au0828-core.c b/drivers/media/video/au0828/au0828-core.c index 5199c8aa588..3281a17fa2c 100644 --- a/drivers/media/video/au0828/au0828-core.c +++ b/drivers/media/video/au0828/au0828-core.c | |||
@@ -152,6 +152,8 @@ static void au0828_usb_disconnect(struct usb_interface *interface) | |||
152 | /* I2C */ | 152 | /* I2C */ |
153 | au0828_i2c_unregister(dev); | 153 | au0828_i2c_unregister(dev); |
154 | 154 | ||
155 | v4l2_device_unregister(&dev->v4l2_dev); | ||
156 | |||
155 | usb_set_intfdata(interface, NULL); | 157 | usb_set_intfdata(interface, NULL); |
156 | 158 | ||
157 | mutex_lock(&dev->mutex); | 159 | mutex_lock(&dev->mutex); |
@@ -165,7 +167,7 @@ static void au0828_usb_disconnect(struct usb_interface *interface) | |||
165 | static int au0828_usb_probe(struct usb_interface *interface, | 167 | static int au0828_usb_probe(struct usb_interface *interface, |
166 | const struct usb_device_id *id) | 168 | const struct usb_device_id *id) |
167 | { | 169 | { |
168 | int ifnum; | 170 | int ifnum, retval; |
169 | struct au0828_dev *dev; | 171 | struct au0828_dev *dev; |
170 | struct usb_device *usbdev = interface_to_usbdev(interface); | 172 | struct usb_device *usbdev = interface_to_usbdev(interface); |
171 | 173 | ||
@@ -192,6 +194,17 @@ static int au0828_usb_probe(struct usb_interface *interface, | |||
192 | 194 | ||
193 | usb_set_intfdata(interface, dev); | 195 | usb_set_intfdata(interface, dev); |
194 | 196 | ||
197 | /* Create the v4l2_device */ | ||
198 | snprintf(dev->v4l2_dev.name, sizeof(dev->v4l2_dev.name), "%s-%03d", | ||
199 | "au0828", 0); | ||
200 | retval = v4l2_device_register(&dev->usbdev->dev, &dev->v4l2_dev); | ||
201 | if (retval) { | ||
202 | printk(KERN_ERR "%s() v4l2_device_register failed\n", | ||
203 | __func__); | ||
204 | kfree(dev); | ||
205 | return -EIO; | ||
206 | } | ||
207 | |||
195 | /* Power Up the bridge */ | 208 | /* Power Up the bridge */ |
196 | au0828_write(dev, REG_600, 1 << 4); | 209 | au0828_write(dev, REG_600, 1 << 4); |
197 | 210 | ||