summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/au0828
diff options
context:
space:
mode:
authorJanne Grunau <j@jannau.net>2009-04-01 13:48:29 +0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-04-07 02:44:15 +0200
commit4bb685108e0189e4c3acda06f79886d79465b45a (patch)
tree87c0f90de696ffa682776240f6f14f76587d0360 /drivers/media/video/au0828
parentV4L/DVB (11356): au0828: use usb_interface.dev for v4l2_device_register (diff)
downloadlinux-4bb685108e0189e4c3acda06f79886d79465b45a.tar.xz
linux-4bb685108e0189e4c3acda06f79886d79465b45a.zip
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.c7
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;
module_param_named(debug, au0828_debug, int, 0644);
MODULE_PARM_DESC(debug, "enable debug messages");
-static atomic_t au0828_instance = ATOMIC_INIT(0);
-
#define _AU0828_BULKPIPE 0x03
#define _BULKPIPESIZE 0xffff
@@ -169,7 +167,7 @@ static void au0828_usb_disconnect(struct usb_interface *interface)
static int au0828_usb_probe(struct usb_interface *interface,
const struct usb_device_id *id)
{
- int ifnum, retval, i;
+ int ifnum, retval;
struct au0828_dev *dev;
struct usb_device *usbdev = interface_to_usbdev(interface);
@@ -197,9 +195,6 @@ static int au0828_usb_probe(struct usb_interface *interface,
usb_set_intfdata(interface, dev);
/* Create the v4l2_device */
- i = atomic_inc_return(&au0828_instance) - 1;
- snprintf(dev->v4l2_dev.name, sizeof(dev->v4l2_dev.name), "%s-%03d",
- "au0828", i);
retval = v4l2_device_register(&interface->dev, &dev->v4l2_dev);
if (retval) {
printk(KERN_ERR "%s() v4l2_device_register failed\n",