Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb

[linux-2.6] / drivers / media / video / dabusb.c

diff --git a/drivers/media/video/dabusb.c b/drivers/media/video/dabusb.c
index 1774ab7a40d2c1c54715dd3c8909cfeda99645bf..a5731f90be0f842d39aa1a941c50d0ab31d3f6e9 100644 (file)
--- a/drivers/media/video/dabusb.c
+++ b/drivers/media/video/dabusb.c
@@ -37,7 +37,6 @@
 #include <asm/atomic.h>
 #include <linux/delay.h>
 #include <linux/usb.h>
-#include <linux/smp_lock.h>
 #include <linux/mutex.h>
 
 #include "dabusb.h"
@@ -86,7 +85,7 @@ static int dabusb_add_buf_tail (pdabusb_t s, struct list_head *dst, struct list_
        return ret;
 }
 /*-------------------------------------------------------------------*/
-#ifdef DEBUG 
+#ifdef DEBUG
 static void dump_urb (struct urb *urb)
 {
        dbg("urb                   :%p", urb);
@@ -136,7 +135,7 @@ static int dabusb_free_queue (struct list_head *q)
        for (p = q->next; p != q;) {
                b = list_entry (p, buff_t, buff_list);
 
-#ifdef DEBUG 
+#ifdef DEBUG
                dump_urb(b->purb);
 #endif
                kfree(b->purb->transfer_buffer);
@@ -166,7 +165,7 @@ static int dabusb_free_buffers (pdabusb_t s)
        return 0;
 }
 /*-------------------------------------------------------------------*/
-static void dabusb_iso_complete (struct urb *purb, struct pt_regs *regs)
+static void dabusb_iso_complete (struct urb *purb)
 {
        pbuff_t b = purb->context;
        pdabusb_t s = b->s;
@@ -218,7 +217,7 @@ static int dabusb_alloc_buffers (pdabusb_t s)
                 pipesize, packets, transfer_buffer_length);
 
        while (buffers < (s->total_buffer_size << 10)) {
-               b = (pbuff_t) kzalloc (sizeof (buff_t), GFP_KERNEL);
+               b = kzalloc(sizeof (buff_t), GFP_KERNEL);
                if (!b) {
                        err("kzalloc(sizeof(buff_t))==NULL");
                        goto err;
@@ -287,7 +286,7 @@ static int dabusb_bulk (pdabusb_t s, pbulk_transfer_t pb)
                }
 
        }
-       
+
        if( ret == -EPIPE ) {
                warn("CLEAR_FEATURE request to remove STALL condition.");
                if(usb_clear_halt(s->usbdev, usb_pipeendpoint(pipe)))
@@ -328,7 +327,7 @@ static int dabusb_loadmem (pdabusb_t s, const char *fname)
        PINTEL_HEX_RECORD ptr = firmware;
 
        dbg("Enter dabusb_loadmem (internal)");
-       
+
        ret = dabusb_8051_reset (s, 1);
        while (ptr->Type == 0) {
 
@@ -449,7 +448,7 @@ static int dabusb_startrek (pdabusb_t s)
        if (!list_empty (&s->free_buff_list)) {
                pbuff_t end;
                int ret;
-               
+
        while (!dabusb_add_buf_tail (s, &s->rec_buff_list, &s->free_buff_list)) {
 
                        dbg("submitting: end:%p s->rec_buff_list:%p", s->rec_buff_list.prev, &s->rec_buff_list);
@@ -506,7 +505,7 @@ static ssize_t dabusb_read (struct file *file, char __user *buf, size_t count, l
                        err("error: rec_buf_list is empty");
                        goto err;
                }
-               
+
                b = list_entry (s->rec_buff_list.next, buff_t, buff_list);
                purb = b->purb;
 
@@ -659,7 +658,7 @@ static int dabusb_ioctl (struct inode *inode, struct file *file, unsigned int cm
        switch (cmd) {
 
        case IOCTL_DAB_BULK:
-               pbulk = (pbulk_transfer_t) kmalloc (sizeof (bulk_transfer_t), GFP_KERNEL);
+               pbulk = kmalloc(sizeof (bulk_transfer_t), GFP_KERNEL);
 
                if (!pbulk) {
                        ret = -ENOMEM;
@@ -696,7 +695,7 @@ static int dabusb_ioctl (struct inode *inode, struct file *file, unsigned int cm
        return ret;
 }
 
-static struct file_operations dabusb_fops =
+static const struct file_operations dabusb_fops =
 {
        .owner =        THIS_MODULE,
        .llseek =       no_llseek,
@@ -783,9 +782,9 @@ static void dabusb_disconnect (struct usb_interface *intf)
        pdabusb_t s = usb_get_intfdata (intf);
 
        dbg("dabusb_disconnect");
-       
+
        init_waitqueue_entry(&__wait, current);
-       
+
        usb_set_intfdata (intf, NULL);
        if (s) {
                usb_deregister_dev (intf, &dabusb_class);
@@ -797,7 +796,7 @@ static void dabusb_disconnect (struct usb_interface *intf)
                        schedule();
                current->state = TASK_RUNNING;
                remove_wait_queue(&s->remove_ok, &__wait);
-               
+
                s->usbdev = NULL;
                s->overruns = 0;
        }