26 files changed, 81 insertions, 61 deletions

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index cc4a723e24db..fc87efc5049c 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -188,7 +188,7 @@ config VIDEO_ZORAN
 
           To compile this driver as a module, choose M here: the
           module will be called zr36067.
- 
+
 config VIDEO_ZORAN_BUZ
         tristate "Iomega Buz support"
         depends on VIDEO_ZORAN
@@ -204,8 +204,8 @@ config VIDEO_ZORAN_DC10
 
 config VIDEO_ZORAN_DC30
         tristate "Pinnacle/Miro DC30(+) support"
-        depends on VIDEO_ZORAN
-        help
+        depends on VIDEO_ZORAN
+        help
           Support for the Pinnacle/Miro DC30(+) MJPEG capture/playback
           card. This also supports really old DC10 cards based on the
           zr36050 MJPEG codec and zr36016 VFE.
@@ -260,7 +260,7 @@ config VIDEO_MXB
         ---help---
           This is a video4linux driver for the 'Multimedia eXtension Board'
           TV card by Siemens-Nixdorf.
-          
+
           To compile this driver as a module, choose M here: the
           module will be called mxb.
 
@@ -274,7 +274,7 @@ config VIDEO_DPC
           for SAA7146 bases boards, so if you have some unsupported
           saa7146 based, analog video card, chances are good that it
           will work with this skeleton driver.
-          
+
           To compile this driver as a module, choose M here: the
           module will be called dpc7146.
 
@@ -285,7 +285,7 @@ config VIDEO_HEXIUM_ORION
         ---help---
           This is a video4linux driver for the Hexium HV-PCI6 and
           Orion frame grabber cards by Hexium.
-          
+
           To compile this driver as a module, choose M here: the
           module will be called hexium_orion.
 
@@ -297,7 +297,7 @@ config VIDEO_HEXIUM_GEMINI
           This is a video4linux driver for the Hexium Gemini frame
           grabber card by Hexium. Please note that the Gemini Dual
           card is *not* fully supported.
-          
+
           To compile this driver as a module, choose M here: the
           module will be called hexium_gemini.
 
diff --git a/drivers/media/video/bttv-driver.c b/drivers/media/video/bttv-driver.c
index 24f5afddafbb..1ddf9ba613ef 100644
--- a/drivers/media/video/bttv-driver.c
+++ b/drivers/media/video/bttv-driver.c
@@ -762,9 +762,9 @@ static void set_pll(struct bttv *btv)
         if (btv->pll.pll_ifreq == btv->pll.pll_ofreq) {
                 /* no PLL needed */
                 if (btv->pll.pll_current == 0)
-                        return;
+                        return;
                 bttv_printk(KERN_INFO "bttv%d: PLL can sleep, using XTAL (%d).\n",
-                           btv->c.nr,btv->pll.pll_ifreq);
+                        btv->c.nr,btv->pll.pll_ifreq);
                 btwrite(0x00,BT848_TGCTRL);
                 btwrite(0x00,BT848_PLL_XCI);
                 btv->pll.pll_current = 0;
@@ -772,7 +772,7 @@ static void set_pll(struct bttv *btv)
         }
 
         bttv_printk(KERN_INFO "bttv%d: PLL: %d => %d ",btv->c.nr,
-                   btv->pll.pll_ifreq, btv->pll.pll_ofreq);
+                btv->pll.pll_ifreq, btv->pll.pll_ofreq);
         set_pll_freq(btv, btv->pll.pll_ifreq, btv->pll.pll_ofreq);
 
         for (i=0; i<10; i++) {
@@ -783,10 +783,10 @@ static void set_pll(struct bttv *btv)
                 if (btread(BT848_DSTATUS) & BT848_DSTATUS_PLOCK) {
                         btwrite(0,BT848_DSTATUS);
                 } else {
-                        btwrite(0x08,BT848_TGCTRL);
-                        btv->pll.pll_current = btv->pll.pll_ofreq;
+                        btwrite(0x08,BT848_TGCTRL);
+                        btv->pll.pll_current = btv->pll.pll_ofreq;
                         bttv_printk(" ok\n");
-                        return;
+                        return;
                 }
         }
         btv->pll.pll_current = -1;
@@ -1964,7 +1964,7 @@ static int setup_window(struct bttv_fh *fh, struct bttv *btv,
         }
 
         down(&fh->cap.lock);
-        kfree(fh->ov.clips);
+                kfree(fh->ov.clips);
         fh->ov.clips    = clips;
         fh->ov.nclips   = n;
 
@@ -2758,7 +2758,7 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file,
                         fh->ov.w.height = fb->fmt.height;
                         btv->init.ov.w.width  = fb->fmt.width;
                         btv->init.ov.w.height = fb->fmt.height;
-                        kfree(fh->ov.clips);
+                                kfree(fh->ov.clips);
                         fh->ov.clips = NULL;
                         fh->ov.nclips = 0;
 
diff --git a/drivers/media/video/bttvp.h b/drivers/media/video/bttvp.h
index 3aa9c6e4fc33..1e6a5632c3c7 100644
--- a/drivers/media/video/bttvp.h
+++ b/drivers/media/video/bttvp.h
@@ -45,6 +45,7 @@
 #include <media/tveeprom.h>
 #include <media/ir-common.h>
 
+
 #include "bt848.h"
 #include "bttv.h"
 #include "btcx-risc.h"
diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c
index 4ae3f78cccf2..74e57a53116f 100644
--- a/drivers/media/video/cx88/cx88-blackbird.c
+++ b/drivers/media/video/cx88/cx88-blackbird.c
@@ -616,6 +616,8 @@ static int blackbird_load_firmware(struct cx8802_dev *dev)
 
         retval = request_firmware(&firmware, BLACKBIRD_FIRM_ENC_FILENAME,
                                   &dev->pci->dev);
+
+
         if (retval != 0) {
                 dprintk(0, "ERROR: Hotplug firmware request failed (%s).\n",
                         BLACKBIRD_FIRM_ENC_FILENAME);
diff --git a/drivers/media/video/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c
index 38b12ebaa49e..461019dca901 100644
--- a/drivers/media/video/cx88/cx88-input.c
+++ b/drivers/media/video/cx88/cx88-input.c
@@ -453,7 +453,6 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
                 input_dev->id.product = pci->device;
         }
         input_dev->cdev.dev = &pci->dev;
-
         /* record handles to ourself */
         ir->core = core;
         core->ir = ir;
@@ -586,7 +585,6 @@ void cx88_ir_irq(struct cx88_core *core)
 MODULE_AUTHOR("Gerd Knorr, Pavel Machek, Chris Pascoe");
 MODULE_DESCRIPTION("input driver for cx88 GPIO-based IR remote controls");
 MODULE_LICENSE("GPL");
-
 /*
  * Local variables:
  * c-basic-offset: 8
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h
index 27fb080fd7aa..77beafc5c327 100644
--- a/drivers/media/video/cx88/cx88.h
+++ b/drivers/media/video/cx88/cx88.h
@@ -411,7 +411,6 @@ struct cx8802_dev {
         struct videobuf_dvb        dvb;
         void*                      fe_handle;
         int                        (*fe_release)(void *handle);
-
         /* for switching modulation types */
         unsigned char              ts_gen_cntrl;
 
diff --git a/drivers/media/video/em28xx/em28xx-core.c b/drivers/media/video/em28xx/em28xx-core.c
index 9f6e5e5355a1..517573221972 100644
--- a/drivers/media/video/em28xx/em28xx-core.c
+++ b/drivers/media/video/em28xx/em28xx-core.c
@@ -39,7 +39,7 @@ MODULE_PARM_DESC(core_debug,"enable debug messages [core]");
 #define em28xx_coredbg(fmt, arg...) do {\
         if (core_debug) \
                 printk(KERN_INFO "%s %s :"fmt, \
-                         dev->name, __FUNCTION__ , ##arg); } while (0)
+                         dev->name, __FUNCTION__, ##arg); } while (0)
 
 static unsigned int reg_debug;
 module_param(reg_debug,int,0644);
@@ -48,7 +48,7 @@ MODULE_PARM_DESC(reg_debug,"enable debug messages [URB reg]");
 #define em28xx_regdbg(fmt, arg...) do {\
         if (reg_debug) \
                 printk(KERN_INFO "%s %s :"fmt, \
-                         dev->name, __FUNCTION__ , ##arg); } while (0)
+                         dev->name, __FUNCTION__, ##arg); } while (0)
 
 static unsigned int isoc_debug;
 module_param(isoc_debug,int,0644);
@@ -57,7 +57,7 @@ MODULE_PARM_DESC(isoc_debug,"enable debug messages [isoc transfers]");
 #define em28xx_isocdbg(fmt, arg...) do {\
         if (isoc_debug) \
                 printk(KERN_INFO "%s %s :"fmt, \
-                         dev->name, __FUNCTION__ , ##arg); } while (0)
+                         dev->name, __FUNCTION__, ##arg); } while (0)
 
 static int alt = EM28XX_PINOUT;
 module_param(alt, int, 0644);
@@ -158,6 +158,7 @@ static void rvfree(void *mem, size_t size)
         vfree(mem);
 }
 
+
 /*
  * em28xx_request_buffers()
  * allocate a number of buffers
diff --git a/drivers/media/video/em28xx/em28xx-i2c.c b/drivers/media/video/em28xx/em28xx-i2c.c
index b32d9852f34c..29e21ad187cc 100644
--- a/drivers/media/video/em28xx/em28xx-i2c.c
+++ b/drivers/media/video/em28xx/em28xx-i2c.c
@@ -41,10 +41,10 @@ module_param(i2c_debug, int, 0644);
 MODULE_PARM_DESC(i2c_debug, "enable debug messages [i2c]");
 
 #define dprintk1(lvl,fmt, args...) if (i2c_debug>=lvl) do {\
-                        printk(fmt , ##args); } while (0)
+                        printk(fmt, ##args); } while (0)
 #define dprintk2(lvl,fmt, args...) if (i2c_debug>=lvl) do{ \
                         printk(KERN_DEBUG "%s at %s: " fmt, \
-                        dev->name, __FUNCTION__ , ##args); } while (0)
+                        dev->name, __FUNCTION__, ##args); } while (0)
 
 /*
  * em2800_i2c_send_max4()
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index abec32c175aa..c08e505e7009 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -45,7 +45,7 @@
 #define em28xx_videodbg(fmt, arg...) do {\
         if (video_debug) \
                 printk(KERN_INFO "%s %s :"fmt, \
-                         dev->name, __FUNCTION__ , ##arg); } while (0)
+                         dev->name, __FUNCTION__, ##arg); } while (0)
 
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h
index 5c7a41ce69f3..1e2ee43db394 100644
--- a/drivers/media/video/em28xx/em28xx.h
+++ b/drivers/media/video/em28xx/em28xx.h
@@ -392,18 +392,18 @@ extern const unsigned int em28xx_bcount;
 /* printk macros */
 
 #define em28xx_err(fmt, arg...) do {\
-        printk(KERN_ERR fmt , ##arg); } while (0)
+        printk(KERN_ERR fmt, ##arg); } while (0)
 
 #define em28xx_errdev(fmt, arg...) do {\
         printk(KERN_ERR "%s: "fmt,\
-                        dev->name , ##arg); } while (0)
+                        dev->name, ##arg); } while (0)
 
 #define em28xx_info(fmt, arg...) do {\
         printk(KERN_INFO "%s: "fmt,\
-                        dev->name , ##arg); } while (0)
+                        dev->name, ##arg); } while (0)
 #define em28xx_warn(fmt, arg...) do {\
         printk(KERN_WARNING "%s: "fmt,\
-                        dev->name , ##arg); } while (0)
+                        dev->name, ##arg); } while (0)
 
 inline static int em28xx_audio_source(struct em28xx *dev, int input)
 {
diff --git a/drivers/media/video/ir-kbd-gpio.c b/drivers/media/video/ir-kbd-gpio.c
index 6345e29e4951..de1385e5d05e 100644
--- a/drivers/media/video/ir-kbd-gpio.c
+++ b/drivers/media/video/ir-kbd-gpio.c
@@ -291,13 +291,12 @@ struct IR {
         u32                     mask_keycode;
         u32                     mask_keydown;
         u32                     mask_keyup;
-        u32                     polling;
+        u32                     polling;
         u32                     last_gpio;
         struct work_struct      work;
         struct timer_list       timer;
 
         /* RC5 gpio */
-
         u32 rc5_gpio;
         struct timer_list timer_end;    /* timer_end for code completion */
         struct timer_list timer_keyup;  /* timer_end for key release */
@@ -647,7 +646,7 @@ static int ir_probe(struct device *dev)
                 driver.any_irq = ir_rc5_irq;
                 driver.gpio_irq = NULL;
                 ir->rc5_gpio = 1;
-                 break;
+                break;
         }
         if (NULL == ir_codes) {
                 kfree(ir);
@@ -657,7 +656,7 @@ static int ir_probe(struct device *dev)
 
         if (ir->rc5_gpio) {
                 u32 gpio;
-                /* enable remote irq */
+                /* enable remote irq */
                 bttv_gpio_inout(sub->core, (1 << 4), 1 << 4);
                 gpio = bttv_gpio_read(sub->core);
                 bttv_gpio_write(sub->core, gpio & ~(1 << 4));
@@ -726,6 +725,7 @@ static int ir_remove(struct device *dev)
                 del_timer(&ir->timer);
                 flush_scheduled_work();
         }
+
         if (ir->rc5_gpio) {
                 u32 gpio;
 
diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c
index ca4027422e76..52c54b15fd4a 100644
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
@@ -40,6 +40,7 @@
 #include <linux/i2c.h>
 #include <linux/workqueue.h>
 #include <asm/semaphore.h>
+
 #include <media/ir-common.h>
 #include <media/ir-kbd-i2c.h>
 
@@ -299,7 +300,7 @@ static int ir_attach(struct i2c_adapter *adap, int addr,
         struct IR_i2c *ir;
         struct input_dev *input_dev;
 
-        ir = kzalloc(sizeof(struct IR_i2c), GFP_KERNEL);
+        ir = kzalloc(sizeof(struct IR_i2c),GFP_KERNEL);
         input_dev = input_allocate_device();
         if (!ir || !input_dev) {
                 kfree(ir);
@@ -360,7 +361,7 @@ static int ir_attach(struct i2c_adapter *adap, int addr,
         /* register i2c device
          * At device register, IR codes may be changed to be
          * board dependent.
-        */
+         */
         i2c_attach_client(&ir->c);
 
         /* If IR not supported or disabled, unregisters driver */
diff --git a/drivers/media/video/msp3400.c b/drivers/media/video/msp3400.c
index 61b99b0d8583..d86f8e92e534 100644
--- a/drivers/media/video/msp3400.c
+++ b/drivers/media/video/msp3400.c
@@ -134,7 +134,7 @@ struct msp3400c {
         int rxsubchans;
 
         int muted;
-        int left, right;        /* volume */
+        int left, right;        /* volume */
         int bass, treble;
 
         /* shadow register set */
@@ -882,6 +882,7 @@ static void watch_stereo(struct i2c_client *client)
                 msp->watch_stereo = 0;
 }
 
+
 static int msp3400c_thread(void *data)
 {
         struct i2c_client *client = data;
@@ -889,6 +890,7 @@ static int msp3400c_thread(void *data)
         struct CARRIER_DETECT *cd;
         int count, max1,max2,val1,val2, val,this;
 
+
         msp3400_info("msp3400 daemon started\n");
         for (;;) {
                 msp3400_dbg_mediumvol("msp3400 thread: sleep\n");
@@ -1162,6 +1164,7 @@ static int msp3410d_thread(void *data)
         int mode,val,i,std;
 
         msp3400_info("msp3410 daemon started\n");
+
         for (;;) {
                 msp3400_dbg_mediumvol("msp3410 thread: sleep\n");
                 msp34xx_sleep(msp,-1);
@@ -1384,6 +1387,7 @@ static int msp34xxg_thread(void *data)
         int val, std, i;
 
         msp3400_info("msp34xxg daemon started\n");
+
         msp->source = 1; /* default */
         for (;;) {
                 msp3400_dbg_mediumvol("msp34xxg thread: sleep\n");
diff --git a/drivers/media/video/saa6588.c b/drivers/media/video/saa6588.c
index dca3ddfd510f..923322503e8f 100644
--- a/drivers/media/video/saa6588.c
+++ b/drivers/media/video/saa6588.c
@@ -422,7 +422,6 @@ static int saa6588_attach(struct i2c_adapter *adap, int addr, int kind)
         s->timer.function = saa6588_timer;
         s->timer.data = (unsigned long)s;
         schedule_work(&s->work);
-
         return 0;
 }
 
diff --git a/drivers/media/video/saa711x.c b/drivers/media/video/saa711x.c
index 59e13fdea780..31f7b950b01c 100644
--- a/drivers/media/video/saa711x.c
+++ b/drivers/media/video/saa711x.c
@@ -59,7 +59,7 @@ MODULE_PARM_DESC(debug, " Set the default Debug level.  Default: 0 (Off) - (0-1)
 #define dprintk(num, format, args...) \
         do { \
                 if (debug >= num) \
-                        printk(format , ##args); \
+                        printk(format, ##args); \
         } while (0)
 
 /* ----------------------------------------------------------------------- */
diff --git a/drivers/media/video/saa7134/saa6752hs.c b/drivers/media/video/saa7134/saa6752hs.c
index cf1e0c2b0351..a61d24f588f7 100644
--- a/drivers/media/video/saa7134/saa6752hs.c
+++ b/drivers/media/video/saa7134/saa6752hs.c
@@ -524,6 +524,7 @@ static int saa6752hs_attach(struct i2c_adapter *adap, int addr, int kind)
 
         i2c_set_clientdata(&h->client, h);
         i2c_attach_client(&h->client);
+
         return 0;
 }
 
diff --git a/drivers/media/video/saa7134/saa7134-alsa.c b/drivers/media/video/saa7134/saa7134-alsa.c
index f2788ebb59a8..b24a26b065c2 100644
--- a/drivers/media/video/saa7134/saa7134-alsa.c
+++ b/drivers/media/video/saa7134/saa7134-alsa.c
@@ -51,6 +51,7 @@ MODULE_PARM_DESC(debug,"enable debug messages [alsa]");
 #define MIXER_ADDR_LINE2        2
 #define MIXER_ADDR_LAST         2
 
+
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 0-MAX */
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;       /* ID for this card */
 static int enable[SNDRV_CARDS] = {1, [1 ... (SNDRV_CARDS - 1)] = 0};
@@ -59,11 +60,14 @@ module_param_array(index, int, NULL, 0444);
 MODULE_PARM_DESC(index, "Index value for SAA7134 capture interface(s).");
 
 #define dprintk(fmt, arg...)    if (debug) \
-        printk(KERN_DEBUG "%s/alsa: " fmt, dev->name , ## arg)
+        printk(KERN_DEBUG "%s/alsa: " fmt, dev->name, ## arg)
+
+
 
 /*
  * Main chip structure
  */
+
 typedef struct snd_card_saa7134 {
         snd_card_t *card;
         spinlock_t mixer_lock;
@@ -1004,6 +1008,7 @@ static int saa7134_alsa_init(void)
                 printk(KERN_INFO "saa7134 ALSA: no saa7134 cards found\n");
 
         return 0;
+
 }
 
 /*
@@ -1027,3 +1032,6 @@ module_init(saa7134_alsa_init);
 module_exit(saa7134_alsa_exit);
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Ricardo Cerqueira");
+
+
+
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c
index 1a093bf176f3..23d8747338ed 100644
--- a/drivers/media/video/saa7134/saa7134-core.c
+++ b/drivers/media/video/saa7134/saa7134-core.c
@@ -71,6 +71,7 @@ static unsigned int radio_nr[] = {[0 ... (SAA7134_MAXBOARDS - 1)] = UNSET };
 static unsigned int tuner[]    = {[0 ... (SAA7134_MAXBOARDS - 1)] = UNSET };
 static unsigned int card[]     = {[0 ... (SAA7134_MAXBOARDS - 1)] = UNSET };
 
+
 module_param_array(video_nr, int, NULL, 0444);
 module_param_array(vbi_nr,   int, NULL, 0444);
 module_param_array(radio_nr, int, NULL, 0444);
diff --git a/drivers/media/video/saa7134/saa7134-empress.c b/drivers/media/video/saa7134/saa7134-empress.c
index e9ec69efb4c9..575f3e835f91 100644
--- a/drivers/media/video/saa7134/saa7134-empress.c
+++ b/drivers/media/video/saa7134/saa7134-empress.c
@@ -36,6 +36,7 @@ MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]");
 MODULE_LICENSE("GPL");
 
 static unsigned int empress_nr[] = {[0 ... (SAA7134_MAXBOARDS - 1)] = UNSET };
+
 module_param_array(empress_nr, int, NULL, 0444);
 MODULE_PARM_DESC(empress_nr,"ts device number");
 
diff --git a/drivers/media/video/saa7134/saa7134-i2c.c b/drivers/media/video/saa7134/saa7134-i2c.c
index 7575043f0874..df9dd36721e0 100644
--- a/drivers/media/video/saa7134/saa7134-i2c.c
+++ b/drivers/media/video/saa7134/saa7134-i2c.c
@@ -333,7 +333,7 @@ static int attach_inform(struct i2c_client *client)
         struct tuner_setup tun_setup;
 
         d1printk( "%s i2c attach [addr=0x%x,client=%s]\n",
-                 client->driver->name, client->addr, client->name);
+                client->driver->name, client->addr, client->name);
 
         /* Am I an i2c remote control? */
 
diff --git a/drivers/media/video/saa7134/saa7134-oss.c b/drivers/media/video/saa7134/saa7134-oss.c
index 1f68b9f3fdec..513a699a6df2 100644
--- a/drivers/media/video/saa7134/saa7134-oss.c
+++ b/drivers/media/video/saa7134/saa7134-oss.c
@@ -792,11 +792,11 @@ static irqreturn_t saa7134_oss_irq(int irq, void *dev_id, struct pt_regs *regs)
                 status = saa_readl(SAA7134_IRQ_STATUS);
 
                 if (report & SAA7134_IRQ_REPORT_DONE_RA3) {
-                        handled = 1;
-                        saa_writel(SAA7134_IRQ_REPORT,report);
-                        saa7134_irq_oss_done(dev, status);
+                        handled = 1;
+                        saa_writel(SAA7134_IRQ_REPORT,report);
+                        saa7134_irq_oss_done(dev, status);
                 } else {
-                        goto out;
+                        goto out;
                 }
         }
 
@@ -811,7 +811,7 @@ int saa7134_oss_init1(struct saa7134_dev *dev)
 {
 
         if ((request_irq(dev->pci->irq, saa7134_oss_irq,
-                         SA_SHIRQ | SA_INTERRUPT, dev->name,
+                         SA_SHIRQ | SA_INTERRUPT, dev->name,
                         (void*) &dev->dmasound)) < 0)
                 return -1;
 
@@ -905,20 +905,20 @@ static int saa7134_dsp_create(struct saa7134_dev *dev)
 
         err = dev->dmasound.minor_dsp =
                 register_sound_dsp(&saa7134_dsp_fops,
-                                        dsp_nr[dev->nr]);
+                                   dsp_nr[dev->nr]);
         if (err < 0) {
                 goto fail;
         }
         printk(KERN_INFO "%s: registered device dsp%d\n",
-                dev->name,dev->dmasound.minor_dsp >> 4);
+               dev->name,dev->dmasound.minor_dsp >> 4);
 
         err = dev->dmasound.minor_mixer =
                 register_sound_mixer(&saa7134_mixer_fops,
-                                        mixer_nr[dev->nr]);
+                                     mixer_nr[dev->nr]);
         if (err < 0)
                 goto fail;
         printk(KERN_INFO "%s: registered device mixer%d\n",
-                dev->name,dev->dmasound.minor_mixer >> 4);
+               dev->name,dev->dmasound.minor_mixer >> 4);
 
         return 0;
 
@@ -994,6 +994,7 @@ static void saa7134_oss_exit(void)
                         continue;
 
                 oss_device_exit(dev);
+
         }
 
         printk(KERN_INFO "saa7134 OSS driver for DMA sound unloaded\n");
diff --git a/drivers/media/video/tda9887.c b/drivers/media/video/tda9887.c
index 14a2066a61b2..2f2414e90e8b 100644
--- a/drivers/media/video/tda9887.c
+++ b/drivers/media/video/tda9887.c
@@ -12,6 +12,7 @@
 #include <media/audiochip.h>
 #include <media/tuner.h>
 
+
 /* Chips:
    TDA9885 (PAL, NTSC)
    TDA9886 (PAL, SECAM, NTSC)
diff --git a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c
index 67757fe07d8d..5b20e8177cad 100644
--- a/drivers/media/video/tvaudio.c
+++ b/drivers/media/video/tvaudio.c
@@ -188,7 +188,7 @@ static int chip_write(struct CHIPSTATE *chip, int subaddr, int val)
                 buffer[1] = val;
                 if (2 != i2c_master_send(&chip->c,buffer,2)) {
                         tvaudio_warn("%s: I/O error (write reg%d=0x%x)\n",
-                                                chip->c.name, subaddr, val);
+                        chip->c.name, subaddr, val);
                         return -1;
                 }
         }
@@ -216,7 +216,7 @@ static int chip_read(struct CHIPSTATE *chip)
                 chip->c.name);
                 return -1;
         }
-        tvaudio_dbg("%s: chip_read: 0x%x\n",chip->c.name,buffer);
+        tvaudio_dbg("%s: chip_read: 0x%x\n",chip->c.name, buffer);
         return buffer;
 }
 
@@ -235,7 +235,7 @@ static int chip_read2(struct CHIPSTATE *chip, int subaddr)
                 return -1;
         }
         tvaudio_dbg("%s: chip_read2: reg%d=0x%x\n",
-                        chip->c.name,subaddr,read[0]);
+                chip->c.name, subaddr,read[0]);
         return read[0];
 }
 
@@ -248,7 +248,7 @@ static int chip_cmd(struct CHIPSTATE *chip, char *name, audiocmd *cmd)
 
         /* update our shadow register set; print bytes if (debug > 0) */
         tvaudio_dbg("%s: chip_cmd(%s): reg=%d, data:",
-                chip->c.name,name,cmd->bytes[0]);
+                chip->c.name, name,cmd->bytes[0]);
         for (i = 1; i < cmd->count; i++) {
                 if (debug)
                         printk(" 0x%x",cmd->bytes[i]);
@@ -322,7 +322,7 @@ static void generic_checkmode(struct CHIPSTATE *chip)
         int mode = desc->getmode(chip);
 
         if (mode == chip->prevmode)
-                return;
+        return;
 
         tvaudio_dbg("%s: thread checkmode\n", chip->c.name);
         chip->prevmode = mode;
@@ -1508,13 +1508,13 @@ static int chip_attach(struct i2c_adapter *adap, int addr, int kind)
         tvaudio_info("%s found @ 0x%x (%s)\n", desc->name, addr<<1, adap->name);
         if (desc->flags) {
                 tvaudio_dbg("matches:%s%s%s.\n",
-                        (desc->flags & CHIP_HAS_VOLUME)     ? " volume"      : "",
-                        (desc->flags & CHIP_HAS_BASSTREBLE) ? " bass/treble" : "",
-                        (desc->flags & CHIP_HAS_INPUTSEL)   ? " audiomux"    : "");
+                        (desc->flags & CHIP_HAS_VOLUME)     ? " volume"      : "",
+                        (desc->flags & CHIP_HAS_BASSTREBLE) ? " bass/treble" : "",
+                        (desc->flags & CHIP_HAS_INPUTSEL)   ? " audiomux"    : "");
         }
 
         /* fill required data structures */
-        strcpy(chip->c.name,desc->name);
+        strcpy(chip->c.name, desc->name);
         chip->type = desc-chiplist;
         chip->shadow.count = desc->registers+1;
         chip->prevmode = -1;
@@ -1604,7 +1604,7 @@ static int chip_command(struct i2c_client *client,
         struct CHIPSTATE *chip = i2c_get_clientdata(client);
         struct CHIPDESC  *desc = chiplist + chip->type;
 
-        tvaudio_dbg("%s: chip_command 0x%x\n",chip->c.name,cmd);
+        tvaudio_dbg("%s: chip_command 0x%x\n", chip->c.name, cmd);
 
         switch (cmd) {
         case AUDC_SET_INPUT:
@@ -1624,7 +1624,7 @@ static int chip_command(struct i2c_client *client,
 
         /* --- v4l ioctls --- */
         /* take care: bttv does userspace copying, we'll get a
-                                        kernel pointer here... */
+        kernel pointer here... */
         case VIDIOCGAUDIO:
         {
                 struct video_audio *va = arg;
diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c
index 5c04989471b6..cd7cf1bd12b4 100644
--- a/drivers/media/video/tveeprom.c
+++ b/drivers/media/video/tveeprom.c
@@ -754,6 +754,7 @@ tveeprom_detect_client(struct i2c_adapter *adapter,
         client->flags = I2C_CLIENT_ALLOW_USE;
         snprintf(client->name, sizeof(client->name), "tveeprom");
         i2c_attach_client(client);
+
         return 0;
 }
 
diff --git a/drivers/media/video/tvp5150.c b/drivers/media/video/tvp5150.c
index 81e6d4494e7d..97431e26d229 100644
--- a/drivers/media/video/tvp5150.c
+++ b/drivers/media/video/tvp5150.c
@@ -31,7 +31,7 @@ MODULE_PARM_DESC(debug, "Debug level (0-1)");
 #define dprintk(num, format, args...) \
         do { \
                 if (debug >= num) \
-                        printk(format , ##args); \
+                        printk(format, ##args); \
         } while (0)
 
 /* supported controls */
@@ -770,7 +770,6 @@ static int tvp5150_detect_client(struct i2c_adapter *adapter,
 
         if (debug > 1)
                 dump_reg(client);
-
         return 0;
 }
 
diff --git a/drivers/media/video/video-buf-dvb.c b/drivers/media/video/video-buf-dvb.c
index 55f129e964eb..0a4004a4393c 100644
--- a/drivers/media/video/video-buf-dvb.c
+++ b/drivers/media/video/video-buf-dvb.c
@@ -13,6 +13,7 @@
  * (at your option) any later version.
  */
 
+
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/device.h>
@@ -247,3 +248,4 @@ EXPORT_SYMBOL(videobuf_dvb_unregister);
  * compile-command: "make DVB=1"
  * End:
  */
+