10 files changed, 124 insertions, 124 deletions

diff --git a/drivers/media/video/bt832.c b/drivers/media/video/bt832.c
index e4063950ae57..3ca1d768bfd3 100644
--- a/drivers/media/video/bt832.c
+++ b/drivers/media/video/bt832.c
@@ -231,18 +231,18 @@ bt832_command(struct i2c_client *client, unsigned int cmd, void *arg)
 
 static struct i2c_driver driver = {
         .owner          = THIS_MODULE,
-        .name           = "i2c bt832 driver",
-        .id             = -1, /* FIXME */
-        .flags          = I2C_DF_NOTIFY,
-        .attach_adapter = bt832_probe,
-        .detach_client  = bt832_detach,
-        .command        = bt832_command,
+        .name           = "i2c bt832 driver",
+        .id             = -1, /* FIXME */
+        .flags          = I2C_DF_NOTIFY,
+        .attach_adapter = bt832_probe,
+        .detach_client  = bt832_detach,
+        .command        = bt832_command,
 };
 static struct i2c_client client_template =
 {
         .name       = "bt832",
         .flags      = I2C_CLIENT_ALLOW_USE,
-        .driver     = &driver,
+        .driver     = &driver,
 };
 
 
diff --git a/drivers/media/video/bttv-driver.c b/drivers/media/video/bttv-driver.c
index 3c58a2a68906..24f5afddafbb 100644
--- a/drivers/media/video/bttv-driver.c
+++ b/drivers/media/video/bttv-driver.c
@@ -727,71 +727,71 @@ void free_btres(struct bttv *btv, struct bttv_fh *fh, int bits)
 
 static void set_pll_freq(struct bttv *btv, unsigned int fin, unsigned int fout)
 {
-        unsigned char fl, fh, fi;
+        unsigned char fl, fh, fi;
 
-        /* prevent overflows */
-        fin/=4;
-        fout/=4;
+        /* prevent overflows */
+        fin/=4;
+        fout/=4;
 
-        fout*=12;
-        fi=fout/fin;
+        fout*=12;
+        fi=fout/fin;
 
-        fout=(fout%fin)*256;
-        fh=fout/fin;
+        fout=(fout%fin)*256;
+        fh=fout/fin;
 
-        fout=(fout%fin)*256;
-        fl=fout/fin;
+        fout=(fout%fin)*256;
+        fl=fout/fin;
 
-        btwrite(fl, BT848_PLL_F_LO);
-        btwrite(fh, BT848_PLL_F_HI);
-        btwrite(fi|BT848_PLL_X, BT848_PLL_XCI);
+        btwrite(fl, BT848_PLL_F_LO);
+        btwrite(fh, BT848_PLL_F_HI);
+        btwrite(fi|BT848_PLL_X, BT848_PLL_XCI);
 }
 
 static void set_pll(struct bttv *btv)
 {
-        int i;
+        int i;
 
-        if (!btv->pll.pll_crystal)
-                return;
+        if (!btv->pll.pll_crystal)
+                return;
 
         if (btv->pll.pll_ofreq == btv->pll.pll_current) {
                 dprintk("bttv%d: PLL: no change required\n",btv->c.nr);
-                return;
-        }
+                return;
+        }
 
-        if (btv->pll.pll_ifreq == btv->pll.pll_ofreq) {
-                /* no PLL needed */
-                if (btv->pll.pll_current == 0)
-                        return;
+        if (btv->pll.pll_ifreq == btv->pll.pll_ofreq) {
+                /* no PLL needed */
+                if (btv->pll.pll_current == 0)
+                        return;
                 bttv_printk(KERN_INFO "bttv%d: PLL can sleep, using XTAL (%d).\n",
-                           btv->c.nr,btv->pll.pll_ifreq);
-                btwrite(0x00,BT848_TGCTRL);
-                btwrite(0x00,BT848_PLL_XCI);
-                btv->pll.pll_current = 0;
-                return;
-        }
+                           btv->c.nr,btv->pll.pll_ifreq);
+                btwrite(0x00,BT848_TGCTRL);
+                btwrite(0x00,BT848_PLL_XCI);
+                btv->pll.pll_current = 0;
+                return;
+        }
 
         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++) {
+        for (i=0; i<10; i++) {
                 /*  Let other people run while the PLL stabilizes */
                 bttv_printk(".");
                 msleep(10);
 
-                if (btread(BT848_DSTATUS) & BT848_DSTATUS_PLOCK) {
+                if (btread(BT848_DSTATUS) & BT848_DSTATUS_PLOCK) {
                         btwrite(0,BT848_DSTATUS);
-                } else {
-                        btwrite(0x08,BT848_TGCTRL);
-                        btv->pll.pll_current = btv->pll.pll_ofreq;
+                } else {
+                        btwrite(0x08,BT848_TGCTRL);
+                        btv->pll.pll_current = btv->pll.pll_ofreq;
                         bttv_printk(" ok\n");
-                        return;
-                }
-        }
-        btv->pll.pll_current = -1;
+                        return;
+                }
+        }
+        btv->pll.pll_current = -1;
         bttv_printk("failed\n");
-        return;
+        return;
 }
 
 /* used to switch between the bt848's analog/digital video capture modes */
diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c
index 124c502ea1f3..ca4027422e76 100644
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
@@ -296,7 +296,7 @@ static int ir_attach(struct i2c_adapter *adap, int addr,
         IR_KEYTAB_TYPE *ir_codes = NULL;
         char *name;
         int ir_type;
-        struct IR_i2c *ir;
+        struct IR_i2c *ir;
         struct input_dev *input_dev;
 
         ir = kzalloc(sizeof(struct IR_i2c), GFP_KERNEL);
@@ -304,7 +304,7 @@ static int ir_attach(struct i2c_adapter *adap, int addr,
         if (!ir || !input_dev) {
                 kfree(ir);
                 input_free_device(input_dev);
-                return -ENOMEM;
+                return -ENOMEM;
         }
 
         ir->c = client_template;
diff --git a/drivers/media/video/msp3400.c b/drivers/media/video/msp3400.c
index a23fb0338986..61b99b0d8583 100644
--- a/drivers/media/video/msp3400.c
+++ b/drivers/media/video/msp3400.c
@@ -1559,11 +1559,11 @@ static void msp_wake_thread(struct i2c_client *client);
 static struct i2c_driver driver = {
         .owner          = THIS_MODULE,
         .name           = "msp3400",
-        .id             = I2C_DRIVERID_MSP3400,
-        .flags          = I2C_DF_NOTIFY,
-        .attach_adapter = msp_probe,
-        .detach_client  = msp_detach,
-        .command        = msp_command,
+        .id             = I2C_DRIVERID_MSP3400,
+        .flags          = I2C_DF_NOTIFY,
+        .attach_adapter = msp_probe,
+        .detach_client  = msp_detach,
+        .command        = msp_command,
         .driver = {
                 .suspend = msp_suspend,
                 .resume  = msp_resume,
@@ -1574,7 +1574,7 @@ static struct i2c_client client_template =
 {
         .name      = "(unset)",
         .flags     = I2C_CLIENT_ALLOW_USE,
-        .driver    = &driver,
+        .driver    = &driver,
 };
 
 static int msp_attach(struct i2c_adapter *adap, int addr, int kind)
diff --git a/drivers/media/video/saa7134/saa6752hs.c b/drivers/media/video/saa7134/saa6752hs.c
index cdd1ed9c8065..cf1e0c2b0351 100644
--- a/drivers/media/video/saa7134/saa6752hs.c
+++ b/drivers/media/video/saa7134/saa6752hs.c
@@ -523,7 +523,7 @@ static int saa6752hs_attach(struct i2c_adapter *adap, int addr, int kind)
         h->standard = 0;
 
         i2c_set_clientdata(&h->client, h);
-        i2c_attach_client(&h->client);
+        i2c_attach_client(&h->client);
         return 0;
 }
 
@@ -597,19 +597,19 @@ saa6752hs_command(struct i2c_client *client, unsigned int cmd, void *arg)
 
 static struct i2c_driver driver = {
         .owner          = THIS_MODULE,
-        .name           = "i2c saa6752hs MPEG encoder",
-        .id             = I2C_DRIVERID_SAA6752HS,
-        .flags          = I2C_DF_NOTIFY,
-        .attach_adapter = saa6752hs_probe,
-        .detach_client  = saa6752hs_detach,
-        .command        = saa6752hs_command,
+        .name           = "i2c saa6752hs MPEG encoder",
+        .id             = I2C_DRIVERID_SAA6752HS,
+        .flags          = I2C_DF_NOTIFY,
+        .attach_adapter = saa6752hs_probe,
+        .detach_client  = saa6752hs_detach,
+        .command        = saa6752hs_command,
 };
 
 static struct i2c_client client_template =
 {
         .name       = "saa6752hs",
         .flags      = I2C_CLIENT_ALLOW_USE,
-        .driver     = &driver,
+        .driver     = &driver,
 };
 
 static int __init saa6752hs_init_module(void)
diff --git a/drivers/media/video/saa7134/saa7134-alsa.c b/drivers/media/video/saa7134/saa7134-alsa.c
index 263c6e2e3e8e..f2788ebb59a8 100644
--- a/drivers/media/video/saa7134/saa7134-alsa.c
+++ b/drivers/media/video/saa7134/saa7134-alsa.c
@@ -59,7 +59,7 @@ 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
@@ -208,8 +208,8 @@ static void saa7134_irq_alsa_done(struct saa7134_dev *dev,
 
 static irqreturn_t saa7134_alsa_irq(int irq, void *dev_id, struct pt_regs *regs)
 {
-        struct saa7134_dmasound *dmasound = dev_id;
-        struct saa7134_dev *dev = dmasound->priv_data;
+        struct saa7134_dmasound *dmasound = dev_id;
+        struct saa7134_dev *dev = dmasound->priv_data;
 
         unsigned long report, status;
         int loop, handled = 0;
@@ -985,7 +985,7 @@ static int saa7134_alsa_init(void)
         struct saa7134_dev *dev = NULL;
         struct list_head *list;
 
-        printk(KERN_INFO "saa7134 ALSA driver for DMA sound loaded\n");
+        printk(KERN_INFO "saa7134 ALSA driver for DMA sound loaded\n");
 
         list_for_each(list,&saa7134_devlist) {
                 dev = list_entry(list, struct saa7134_dev, devlist);
diff --git a/drivers/media/video/saa7134/saa7134-oss.c b/drivers/media/video/saa7134/saa7134-oss.c
index 5a579194e455..1f68b9f3fdec 100644
--- a/drivers/media/video/saa7134/saa7134-oss.c
+++ b/drivers/media/video/saa7134/saa7134-oss.c
@@ -782,36 +782,36 @@ struct file_operations saa7134_mixer_fops = {
 
 static irqreturn_t saa7134_oss_irq(int irq, void *dev_id, struct pt_regs *regs)
 {
-        struct saa7134_dmasound *dmasound = dev_id;
-        struct saa7134_dev *dev = dmasound->priv_data;
-        unsigned long report, status;
-        int loop, handled = 0;
-
-        for (loop = 0; loop < 10; loop++) {
-                report = saa_readl(SAA7134_IRQ_REPORT);
-                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);
-                } else {
-                        goto out;
-                }
-        }
-
-        if (loop == 10) {
-                dprintk("error! looping IRQ!");
-        }
+        struct saa7134_dmasound *dmasound = dev_id;
+        struct saa7134_dev *dev = dmasound->priv_data;
+        unsigned long report, status;
+        int loop, handled = 0;
+
+        for (loop = 0; loop < 10; loop++) {
+                report = saa_readl(SAA7134_IRQ_REPORT);
+                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);
+                } else {
+                        goto out;
+                }
+        }
+
+        if (loop == 10) {
+                dprintk("error! looping IRQ!");
+        }
 out:
-        return IRQ_RETVAL(handled);
+        return IRQ_RETVAL(handled);
 }
 
 int saa7134_oss_init1(struct saa7134_dev *dev)
 {
 
-        if ((request_irq(dev->pci->irq, saa7134_oss_irq,
-                         SA_SHIRQ | SA_INTERRUPT, dev->name,
+        if ((request_irq(dev->pci->irq, saa7134_oss_irq,
+                         SA_SHIRQ | SA_INTERRUPT, dev->name,
                         (void*) &dev->dmasound)) < 0)
                 return -1;
 
@@ -905,7 +905,7 @@ 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;
         }
@@ -923,7 +923,7 @@ static int saa7134_dsp_create(struct saa7134_dev *dev)
         return 0;
 
 fail:
-        unregister_sound_dsp(dev->dmasound.minor_dsp);
+        unregister_sound_dsp(dev->dmasound.minor_dsp);
         return 0;
 
 
@@ -956,49 +956,49 @@ static int oss_device_exit(struct saa7134_dev *dev)
 
 static int saa7134_oss_init(void)
 {
-        struct saa7134_dev *dev = NULL;
-        struct list_head *list;
+        struct saa7134_dev *dev = NULL;
+        struct list_head *list;
 
-        printk(KERN_INFO "saa7134 OSS driver for DMA sound loaded\n");
+        printk(KERN_INFO "saa7134 OSS driver for DMA sound loaded\n");
 
-        list_for_each(list,&saa7134_devlist) {
-                dev = list_entry(list, struct saa7134_dev, devlist);
+        list_for_each(list,&saa7134_devlist) {
+                dev = list_entry(list, struct saa7134_dev, devlist);
                 if (dev->dmasound.priv_data == NULL) {
                         oss_device_init(dev);
                 } else {
-                        printk(KERN_ERR "saa7134 OSS: DMA sound is being handled by ALSA, ignoring %s\n",dev->name);
+                        printk(KERN_ERR "saa7134 OSS: DMA sound is being handled by ALSA, ignoring %s\n",dev->name);
                         return -EBUSY;
                 }
-        }
+        }
 
-        if (dev == NULL)
-                printk(KERN_INFO "saa7134 OSS: no saa7134 cards found\n");
+        if (dev == NULL)
+                printk(KERN_INFO "saa7134 OSS: no saa7134 cards found\n");
 
         dmasound_init = oss_device_init;
         dmasound_exit = oss_device_exit;
 
-        return 0;
+        return 0;
 
 }
 
 static void saa7134_oss_exit(void)
 {
-        struct saa7134_dev *dev = NULL;
-        struct list_head *list;
+        struct saa7134_dev *dev = NULL;
+        struct list_head *list;
 
-        list_for_each(list,&saa7134_devlist) {
-                dev = list_entry(list, struct saa7134_dev, devlist);
+        list_for_each(list,&saa7134_devlist) {
+                dev = list_entry(list, struct saa7134_dev, devlist);
 
                 /* Device isn't registered by OSS, probably ALSA's */
                 if (!dev->dmasound.minor_dsp)
                         continue;
 
                 oss_device_exit(dev);
-        }
+        }
 
-        printk(KERN_INFO "saa7134 OSS driver for DMA sound unloaded\n");
+        printk(KERN_INFO "saa7134 OSS driver for DMA sound unloaded\n");
 
-        return;
+        return;
 }
 
 module_init(saa7134_oss_init);
diff --git a/drivers/media/video/tda9887.c b/drivers/media/video/tda9887.c
index 4249127c0a1d..14a2066a61b2 100644
--- a/drivers/media/video/tda9887.c
+++ b/drivers/media/video/tda9887.c
@@ -819,12 +819,12 @@ static int tda9887_resume(struct device * dev)
 
 static struct i2c_driver driver = {
         .owner          = THIS_MODULE,
-        .name           = "i2c tda9887 driver",
-        .id             = -1, /* FIXME */
-        .flags          = I2C_DF_NOTIFY,
-        .attach_adapter = tda9887_probe,
-        .detach_client  = tda9887_detach,
-        .command        = tda9887_command,
+        .name           = "i2c tda9887 driver",
+        .id             = -1, /* FIXME */
+        .flags          = I2C_DF_NOTIFY,
+        .attach_adapter = tda9887_probe,
+        .detach_client  = tda9887_detach,
+        .command        = tda9887_command,
         .driver = {
                 .suspend = tda9887_suspend,
                 .resume  = tda9887_resume,
@@ -834,7 +834,7 @@ static struct i2c_client client_template =
 {
         .name      = "tda9887",
         .flags     = I2C_CLIENT_ALLOW_USE,
-        .driver    = &driver,
+        .driver    = &driver,
 };
 
 static int __init tda9887_init_module(void)
diff --git a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c
index c31bf28b73fe..67757fe07d8d 100644
--- a/drivers/media/video/tvaudio.c
+++ b/drivers/media/video/tvaudio.c
@@ -1506,18 +1506,18 @@ static int chip_attach(struct i2c_adapter *adap, int addr, int kind)
                 return -EIO;
         }
         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"    : "");
-        }
+        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"    : "");
+        }
 
         /* fill required data structures */
         strcpy(chip->c.name,desc->name);
         chip->type = desc-chiplist;
         chip->shadow.count = desc->registers+1;
-        chip->prevmode = -1;
+        chip->prevmode = -1;
         /* register */
         i2c_attach_client(&chip->c);
 
diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c
index d95aecebbda3..5c04989471b6 100644
--- a/drivers/media/video/tveeprom.c
+++ b/drivers/media/video/tveeprom.c
@@ -753,7 +753,7 @@ tveeprom_detect_client(struct i2c_adapter *adapter,
         client->driver = &i2c_driver_tveeprom;
         client->flags = I2C_CLIENT_ALLOW_USE;
         snprintf(client->name, sizeof(client->name), "tveeprom");
-        i2c_attach_client(client);
+        i2c_attach_client(client);
         return 0;
 }