Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus

[sfrench/cifs-2.6.git] / drivers / media / video / cpia_usb.c

diff --git a/drivers/media/video/cpia_usb.c b/drivers/media/video/cpia_usb.c
index 2ee34a3b92807bf96654c4ce6cd89aa79a8b6ca7..58d193ff591c9b205382f7863e537c2dded81562 100644 (file)
--- a/drivers/media/video/cpia_usb.c
+++ b/drivers/media/video/cpia_usb.c
@@ -109,7 +109,7 @@ static struct cpia_camera_ops cpia_usb_ops = {
 static LIST_HEAD(cam_list);
 static spinlock_t cam_list_lock_usb;
 
-static void cpia_usb_complete(struct urb *urb, struct pt_regs *regs)
+static void cpia_usb_complete(struct urb *urb)
 {
        int i;
        char *cdata;
@@ -170,7 +170,7 @@ static void cpia_usb_complete(struct urb *urb, struct pt_regs *regs)
        /* resubmit */
        urb->dev = ucpia->dev;
        if ((i = usb_submit_urb(urb, GFP_ATOMIC)) != 0)
-               printk(KERN_ERR "%s: usb_submit_urb ret %d\n", __FUNCTION__,  i);
+               printk(KERN_ERR "%s: usb_submit_urb ret %d\n", __func__,  i);
 }
 
 static int cpia_usb_open(void *privdata)
@@ -584,7 +584,6 @@ static void cpia_disconnect(struct usb_interface *intf)
 {
        struct cam_data *cam = usb_get_intfdata(intf);
        struct usb_cpia *ucpia;
-       struct usb_device *udev;
 
        usb_set_intfdata(intf, NULL);
        if (!cam)
@@ -606,8 +605,6 @@ static void cpia_disconnect(struct usb_interface *intf)
        if (waitqueue_active(&ucpia->wq_stream))
                wake_up_interruptible(&ucpia->wq_stream);
 
-       udev = interface_to_usbdev(intf);
-
        ucpia->curbuff = ucpia->workbuff = NULL;
 
        vfree(ucpia->buffers[2]);