35 files changed, 817 insertions, 817 deletions

diff --git a/drivers/media/common/saa7146_core.c b/drivers/media/common/saa7146_core.c
index 206cc2f61f26..2899d34e5f7e 100644
--- a/drivers/media/common/saa7146_core.c
+++ b/drivers/media/common/saa7146_core.c
@@ -174,8 +174,8 @@ void saa7146_pgtable_free(struct pci_dev *pci, struct saa7146_pgtable *pt)
 
 int saa7146_pgtable_alloc(struct pci_dev *pci, struct saa7146_pgtable *pt)
 {
-        u32          *cpu;
-        dma_addr_t   dma_addr;
+        u32          *cpu;
+        dma_addr_t   dma_addr;
 
         cpu = pci_alloc_consistent(pci, PAGE_SIZE, &dma_addr);
         if (NULL == cpu) {
@@ -405,7 +405,7 @@ static int saa7146_init_one(struct pci_dev *pci, const struct pci_device_id *ent
 
         pci_set_drvdata(pci, dev);
 
-        init_MUTEX(&dev->lock);
+        init_MUTEX(&dev->lock);
         spin_lock_init(&dev->int_slock);
         spin_lock_init(&dev->slock);
 
diff --git a/drivers/media/common/saa7146_fops.c b/drivers/media/common/saa7146_fops.c
index 37888989ea2e..09ec964dec5c 100644
--- a/drivers/media/common/saa7146_fops.c
+++ b/drivers/media/common/saa7146_fops.c
@@ -1,6 +1,6 @@
 #include <media/saa7146_vv.h>
 
-#define BOARD_CAN_DO_VBI(dev)   (dev->revision != 0 && dev->vv_data->vbi_minor != -1) 
+#define BOARD_CAN_DO_VBI(dev)   (dev->revision != 0 && dev->vv_data->vbi_minor != -1)
 
 /****************************************************************************/
 /* resource management functions, shamelessly stolen from saa7134 driver */
@@ -102,9 +102,9 @@ void saa7146_buffer_finish(struct saa7146_dev *dev,
         /* finish current buffer */
         if (NULL == q->curr) {
                 DEB_D(("aiii. no current buffer\n"));
-                return; 
+                return;
         }
-                        
+
         q->curr->vb.state = state;
         do_gettimeofday(&q->curr->vb.ts);
         wake_up(&q->curr->vb.done);
@@ -143,13 +143,13 @@ void saa7146_buffer_next(struct saa7146_dev *dev,
                         // fixme: fix this for vflip != 0
 
                         saa7146_write(dev, PROT_ADDR1, 0);
-                        saa7146_write(dev, MC2, (MASK_02|MASK_18));             
+                        saa7146_write(dev, MC2, (MASK_02|MASK_18));
 
                         /* write the address of the rps-program */
                         saa7146_write(dev, RPS_ADDR0, dev->d_rps0.dma_handle);
                         /* turn on rps */
                         saa7146_write(dev, MC1, (MASK_12 | MASK_28));
-                                
+
 /*
                         printk("vdma%d.base_even:     0x%08x\n", 1,saa7146_read(dev,BASE_EVEN1));
                         printk("vdma%d.base_odd:      0x%08x\n", 1,saa7146_read(dev,BASE_ODD1));
@@ -246,7 +246,7 @@ static int fops_open(struct inode *inode, struct file *file)
                 goto out;
         }
         memset(fh,0,sizeof(*fh));
-        
+
         file->private_data = fh;
         fh->dev = dev;
         fh->type = type;
@@ -275,7 +275,7 @@ out:
                 file->private_data = NULL;
         }
         up(&saa7146_devices_lock);
-        return result;
+        return result;
 }
 
 static int fops_release(struct inode *inode, struct file *file)
@@ -405,7 +405,7 @@ static struct file_operations video_fops =
 static void vv_callback(struct saa7146_dev *dev, unsigned long status)
 {
         u32 isr = status;
-        
+
         DEB_INT(("dev:%p, isr:0x%08x\n",dev,(u32)status));
 
         if (0 != (isr & (MASK_27))) {
@@ -454,11 +454,11 @@ int saa7146_vv_init(struct saa7146_dev* dev, struct saa7146_ext_vv *ext_vv)
            handle different devices that might need different
            configuration data) */
         dev->ext_vv_data = ext_vv;
-        
+
         vv->video_minor = -1;
         vv->vbi_minor = -1;
 
-        vv->d_clipping.cpu_addr = pci_alloc_consistent(dev->pci, SAA7146_CLIPPING_MEM, &vv->d_clipping.dma_handle);     
+        vv->d_clipping.cpu_addr = pci_alloc_consistent(dev->pci, SAA7146_CLIPPING_MEM, &vv->d_clipping.dma_handle);
         if( NULL == vv->d_clipping.cpu_addr ) {
                 ERR(("out of memory. aborting.\n"));
                 kfree(vv);
@@ -468,7 +468,7 @@ int saa7146_vv_init(struct saa7146_dev* dev, struct saa7146_ext_vv *ext_vv)
 
         saa7146_video_uops.init(dev,vv);
         saa7146_vbi_uops.init(dev,vv);
-        
+
         dev->vv_data = vv;
         dev->vv_callback = &vv_callback;
 
@@ -480,12 +480,12 @@ int saa7146_vv_release(struct saa7146_dev* dev)