Merge omap-drivers

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

diff --git a/drivers/media/video/dabusb.c b/drivers/media/video/dabusb.c
index b9ba95f5e02632116b28fe2cf5d4468c36cfd351..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"
@@ -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;
@@ -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,