diff options
author | Janne Grunau <j@jannau.net> | 2009-04-01 07:48:29 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-04-06 20:44:15 -0400 |
commit | 4bb685108e0189e4c3acda06f79886d79465b45a (patch) | |
tree | 87c0f90de696ffa682776240f6f14f76587d0360 /drivers/media/video/au0828 | |
parent | a4124aa95834a6c508e963354205b25cac5352f0 (diff) |
V4L/DVB (11357): au0828: remove explicitly set v4l2_device.name and unused au0828_instance
Signed-off-by: Janne Grunau <j@jannau.net>
Acked-by: Devin Heitmueller <devin.heitmueller@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/au0828')
-rw-r--r-- | drivers/media/video/au0828/au0828-core.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/media/video/au0828/au0828-core.c b/drivers/media/video/au0828/au0828-core.c index 6c711464b714..4cee0b92eeee 100644 --- a/drivers/media/video/au0828/au0828-core.c +++ b/drivers/media/video/au0828/au0828-core.c | |||
@@ -36,8 +36,6 @@ int au0828_debug; | |||
36 | module_param_named(debug, au0828_debug, int, 0644); | 36 | module_param_named(debug, au0828_debug, int, 0644); |
37 | MODULE_PARM_DESC(debug, "enable debug messages"); | 37 | MODULE_PARM_DESC(debug, "enable debug messages"); |
38 | 38 | ||
39 | static atomic_t au0828_instance = ATOMIC_INIT(0); | ||
40 | |||
41 | #define _AU0828_BULKPIPE 0x03 | 39 | #define _AU0828_BULKPIPE 0x03 |
42 | #define _BULKPIPESIZE 0xffff | 40 | #define _BULKPIPESIZE 0xffff |
43 | 41 | ||
@@ -169,7 +167,7 @@ static void au0828_usb_disconnect(struct usb_interface *interface) | |||
169 | static int au0828_usb_probe(struct usb_interface *interface, | 167 | static int au0828_usb_probe(struct usb_interface *interface, |
170 | const struct usb_device_id *id) | 168 | const struct usb_device_id *id) |
171 | { | 169 | { |
172 | int ifnum, retval, i; | 170 | int ifnum, retval; |
173 | struct au0828_dev *dev; | 171 | struct au0828_dev *dev; |
174 | struct usb_device *usbdev = interface_to_usbdev(interface); | 172 | struct usb_device *usbdev = interface_to_usbdev(interface); |
175 | 173 | ||
@@ -197,9 +195,6 @@ static int au0828_usb_probe(struct usb_interface *interface, | |||
197 | usb_set_intfdata(interface, dev); | 195 | usb_set_intfdata(interface, dev); |
198 | 196 | ||
199 | /* Create the v4l2_device */ | 197 | /* Create the v4l2_device */ |
200 | i = atomic_inc_return(&au0828_instance) - 1; | ||
201 | snprintf(dev->v4l2_dev.name, sizeof(dev->v4l2_dev.name), "%s-%03d", | ||
202 | "au0828", i); | ||
203 | retval = v4l2_device_register(&interface->dev, &dev->v4l2_dev); | 198 | retval = v4l2_device_register(&interface->dev, &dev->v4l2_dev); |
204 | if (retval) { | 199 | if (retval) { |
205 | printk(KERN_ERR "%s() v4l2_device_register failed\n", | 200 | printk(KERN_ERR "%s() v4l2_device_register failed\n", |