18 files changed, 55 insertions, 55 deletions

diff --git a/drivers/media/radio/radio-typhoon.c b/drivers/media/radio/radio-typhoon.c
index cf4fc08bd8a7..edd012288669 100644
--- a/drivers/media/radio/radio-typhoon.c
+++ b/drivers/media/radio/radio-typhoon.c
@@ -363,7 +363,7 @@ static int __init typhoon_init(void)
 #ifdef CONFIG_RADIO_TYPHOON_PROC_FS
         if (!create_proc_info_entry("driver/radio-typhoon", 0, NULL,
                                     typhoon_get_info))
-                printk(KERN_ERR "radio-typhoon: registering /proc/driver/radio-typhoon failed\n");
+                printk(KERN_ERR "radio-typhoon: registering /proc/driver/radio-typhoon failed\n");
 #endif
 
         return 0;
diff --git a/drivers/media/video/arv.c b/drivers/media/video/arv.c
index 53824cc229fa..6e08e32346eb 100644
--- a/drivers/media/video/arv.c
+++ b/drivers/media/video/arv.c
@@ -213,7 +213,7 @@ void init_iic(void)
         ar_outl(0x0300, PLDI2CMOD);     /* I2CMOD ACK/8b-data/7b-addr/auto */
         ar_outl(0x1, PLDI2CACK);        /* I2CACK ACK                      */
 
-        /* I2C CLK */
+        /* I2C CLK */
         /* 50MH-100k */
         if (freq == 75) {
                 ar_outl(369, PLDI2CFREQ);       /* BCLK = 75MHz */
diff --git a/drivers/media/video/bt8xx/bttv-cards.c b/drivers/media/video/bt8xx/bttv-cards.c
index 671f92b1df18..726d570ad5bb 100644
--- a/drivers/media/video/bt8xx/bttv-cards.c
+++ b/drivers/media/video/bt8xx/bttv-cards.c
@@ -269,7 +269,7 @@ static struct CARD {
         { 0x41a0a051, BTTV_BOARD_FLYVIDEO_98FM, "Lifeview FlyVideo 98 LR50 Rev Q" },
         { 0x18501f7f, BTTV_BOARD_FLYVIDEO_98,   "Lifeview Flyvideo 98" },
 
-        { 0x010115cb, BTTV_BOARD_GMV1,          "AG GMV1" },
+        { 0x010115cb, BTTV_BOARD_GMV1,          "AG GMV1" },
         { 0x010114c7, BTTV_BOARD_MODTEC_205,    "Modular Technology MM201/MM202/MM205/MM210/MM215 PCTV" },
 
         { 0x10b42636, BTTV_BOARD_HAUPPAUGE878,  "STB ???" },
diff --git a/drivers/media/video/bt8xx/bttv-input.c b/drivers/media/video/bt8xx/bttv-input.c
index 69efa0e5174d..b41f81d2372c 100644
--- a/drivers/media/video/bt8xx/bttv-input.c
+++ b/drivers/media/video/bt8xx/bttv-input.c
@@ -355,7 +355,7 @@ int bttv_input_init(struct bttv *btv)
 
         if (ir->rc5_gpio) {
                 u32 gpio;
-                /* enable remote irq */
+                /* enable remote irq */
                 bttv_gpio_inout(&btv->c, (1 << 4), 1 << 4);
                 gpio = bttv_gpio_read(&btv->c);
                 bttv_gpio_write(&btv->c, gpio & ~(1 << 4));
diff --git a/drivers/media/video/bw-qcam.c b/drivers/media/video/bw-qcam.c
index 709c07cee290..7d0b6e59c6e2 100644
--- a/drivers/media/video/bw-qcam.c
+++ b/drivers/media/video/bw-qcam.c
@@ -760,7 +760,7 @@ static int qcam_do_ioctl(struct inode *inode, struct file *file,
                 {
                         struct video_picture *p = arg;
                         if(p->palette!=VIDEO_PALETTE_GREY)
-                                return -EINVAL;
+                                return -EINVAL;
                         if(p->depth!=4 && p->depth!=6)
                                 return -EINVAL;
 
diff --git a/drivers/media/video/cpia2/cpia2_v4l.c b/drivers/media/video/cpia2/cpia2_v4l.c
index 481e178ef56d..28d93c595df0 100644
--- a/drivers/media/video/cpia2/cpia2_v4l.c
+++ b/drivers/media/video/cpia2/cpia2_v4l.c
@@ -1167,9 +1167,9 @@ static int ioctl_g_ctrl(void *arg,struct camera_data *cam)
                 } else {
                     if(cam->params.flicker_control.cam_register &
                        CPIA2_VP_FLICKER_MODES_50HZ) {
-                        mode = FLICKER_50;
+                        mode = FLICKER_50;
                     } else {
-                        mode = FLICKER_60;
+                        mode = FLICKER_60;
                     }
                 }
                 for(i=0; i<NUM_FLICKER_CONTROLS; i++) {
diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
index d599ecfed08b..dce1feddd55d 100644
--- a/drivers/media/video/cx88/cx88-dvb.c
+++ b/drivers/media/video/cx88/cx88-dvb.c
@@ -358,7 +358,7 @@ static struct or51132_config pchdtv_hd3000 = {
 
 #ifdef HAVE_LGDT330X
 static int lgdt3302_tuner_set_params(struct dvb_frontend* fe,
-                                     struct dvb_frontend_parameters* params)
+                                     struct dvb_frontend_parameters* params)
 {
         /* FIXME make this routine use the tuner-simple code.
          * It could probably be shared with a number of ATSC
diff --git a/drivers/media/video/ov511.c b/drivers/media/video/ov511.c
index fdc8e3f13937..a988df226aab 100644
--- a/drivers/media/video/ov511.c
+++ b/drivers/media/video/ov511.c
@@ -3239,7 +3239,7 @@ ov511_move_data(struct usb_ov511 *ov, unsigned char *in, int n)
                 RESTRICT_TO_RANGE(frame->bytes_recvd, 8, max_raw);
 
                 if (frame->scanstate == STATE_LINES) {
-                        int nextf;
+                        int nextf;
 
                         frame->grabstate = FRAME_DONE;
                         wake_up_interruptible(&frame->wq);
@@ -3405,7 +3405,7 @@ eof:
         RESTRICT_TO_RANGE(frame->bytes_recvd, 8, max_raw);
 
         if (frame->scanstate == STATE_LINES) {
-                int nextf;
+                int nextf;
 
                 frame->grabstate = FRAME_DONE;
                 wake_up_interruptible(&frame->wq);
diff --git a/drivers/media/video/pms.c b/drivers/media/video/pms.c
index fb6471e74dc5..5d681fa8bcb1 100644
--- a/drivers/media/video/pms.c
+++ b/drivers/media/video/pms.c
@@ -805,7 +805,7 @@ static int pms_do_ioctl(struct inode *inode, struct file *file,
                         struct video_picture *p = arg;
                         if(!((p->palette==VIDEO_PALETTE_RGB565 && p->depth==16)
                             ||(p->palette==VIDEO_PALETTE_RGB555 && p->depth==15)))
-                                return -EINVAL;
+                                return -EINVAL;
                         pd->picture= *p;
 
                         /*
diff --git a/drivers/media/video/pwc/pwc-ctrl.c b/drivers/media/video/pwc/pwc-ctrl.c
index 93306c717279..62a581399b19 100644
--- a/drivers/media/video/pwc/pwc-ctrl.c
+++ b/drivers/media/video/pwc/pwc-ctrl.c
@@ -1385,7 +1385,7 @@ int pwc_ioctl(struct pwc_device *pdev, unsigned int cmd, void *arg)
 
                 ARG_IN(leds)
                 ret = pwc_set_leds(pdev, ARGR(leds).led_on, ARGR(leds).led_off);
-                break;
+                break;
         }
 
 
diff --git a/drivers/media/video/pwc/pwc-dec23.c b/drivers/media/video/pwc/pwc-dec23.c
index 39eaf58396df..9e2d91f26bfe 100644
--- a/drivers/media/video/pwc/pwc-dec23.c
+++ b/drivers/media/video/pwc/pwc-dec23.c
@@ -105,7 +105,7 @@ static void build_bit_powermask_table(struct pwc_dec23_private *pdec)
 
 
 static void build_table_color(const unsigned int romtable[16][8],
-                              unsigned char p0004[16][1024],
+                              unsigned char p0004[16][1024],
                               unsigned char p8004[16][256])
 {
         int compression_mode, j, k, bit, pw;
@@ -787,7 +787,7 @@ static void DecompressBand23(struct pwc_dec23_private *pdec,
  *
  */
 static void DecompressBandBayer(struct pwc_dec23_private *pdec,
-                                const unsigned char *rawyuv,
+                                const unsigned char *rawyuv,
                                 unsigned char *rgbbayer,
                                 unsigned int   compressed_image_width,
                                 unsigned int   real_image_width)
diff --git a/drivers/media/video/pwc/pwc-if.c b/drivers/media/video/pwc/pwc-if.c
index 98059c8d6f69..d1cec3976063 100644
--- a/drivers/media/video/pwc/pwc-if.c
+++ b/drivers/media/video/pwc/pwc-if.c
@@ -1064,7 +1064,7 @@ static const char *pwc_sensor_type_to_string(unsigned int sensor_type)
                 case 0x101:
                         return "PAL MR sensor";
                 default:
-                        return "unknown type of sensor";
+                        return "unknown type of sensor";
         }
 }
 #endif
@@ -1696,10 +1696,10 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id
                      (device_hint[hint].pdev == NULL)) {
                         /* so far, so good... try serial number */
                         if ((device_hint[hint].serial_number[0] == '*') || !strcmp(device_hint[hint].serial_number, serial_number)) {
-                                /* match! */
-                                video_nr = device_hint[hint].device_node;
-                                PWC_DEBUG_PROBE("Found hint, will try to register as /dev/video%d\n", video_nr);
-                                break;
+                                /* match! */
+                                video_nr = device_hint[hint].device_node;
+                                PWC_DEBUG_PROBE("Found hint, will try to register as /dev/video%d\n", video_nr);
+                                break;
                         }
                 }
         }
diff --git a/drivers/media/video/pwc/pwc-v4l.c b/drivers/media/video/pwc/pwc-v4l.c
index 9432cbc0e6f5..b7eb3ce3b968 100644
--- a/drivers/media/video/pwc/pwc-v4l.c
+++ b/drivers/media/video/pwc/pwc-v4l.c
@@ -676,9 +676,9 @@ int pwc_video_do_ioctl(struct inode *inode, struct file *file,
                         break;
                 }
 
-                /* V4L2 Layer */
-                case VIDIOC_QUERYCAP:
-                {
+                /* V4L2 Layer */
+                case VIDIOC_QUERYCAP:
+                {
                     struct v4l2_capability *cap = arg;
 
                     PWC_DEBUG_IOCTL("ioctl(VIDIOC_QUERYCAP) This application "\
@@ -694,8 +694,8 @@ int pwc_video_do_ioctl(struct inode *inode, struct file *file,
                     return 0;
                 }
 
-                case VIDIOC_ENUMINPUT:
-                {
+                case VIDIOC_ENUMINPUT:
+                {
                     struct v4l2_input *i = arg;
 
                     if ( i->index )     /* Only one INPUT is supported */
@@ -706,14 +706,14 @@ int pwc_video_do_ioctl(struct inode *inode, struct file *file,
                     return 0;
                 }
 
-                case VIDIOC_G_INPUT:
+                case VIDIOC_G_INPUT:
                 {
                     int *i = arg;
                     *i = 0;     /* Only one INPUT is supported */
                     return 0;
                 }
-                case VIDIOC_S_INPUT:
-                {
+                case VIDIOC_S_INPUT:
+                {
                         int *i = arg;
 
                         if ( *i ) {     /* Only one INPUT is supported */
@@ -725,7 +725,7 @@ int pwc_video_do_ioctl(struct inode *inode, struct file *file,
                 }
 
                 /* TODO: */
-                case VIDIOC_QUERYCTRL:
+                case VIDIOC_QUERYCTRL:
                 {
                         struct v4l2_queryctrl *c = arg;
                         int i;
@@ -963,13 +963,13 @@ int pwc_video_do_ioctl(struct inode *inode, struct file *file,
 
                 case VIDIOC_ENUM_FMT:
                 {
-                        struct v4l2_fmtdesc *f = arg;
+                        struct v4l2_fmtdesc *f = arg;
                         int index;
 
                         if (f->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
                               return -EINVAL;
 
-                        /* We only support two format: the raw format, and YUV */
+                        /* We only support two format: the raw format, and YUV */
                         index = f->index;
                         memset(f,0,sizeof(struct v4l2_fmtdesc));
                         f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
@@ -978,23 +978,23 @@ int pwc_video_do_ioctl(struct inode *inode, struct file *file,
                         {
                                 case 0:
                                         /* RAW format */
-                                        f->pixelformat = pdev->type<=646?V4L2_PIX_FMT_PWC1:V4L2_PIX_FMT_PWC2;
+                                        f->pixelformat = pdev->type<=646?V4L2_PIX_FMT_PWC1:V4L2_PIX_FMT_PWC2;
                                         f->flags = V4L2_FMT_FLAG_COMPRESSED;
-                                        strlcpy(f->description,"Raw Philips Webcam",sizeof(f->description));
+                                        strlcpy(f->description,"Raw Philips Webcam",sizeof(f->description));
                                         break;
                                 case 1:
-                                        f->pixelformat = V4L2_PIX_FMT_YUV420;
-                                        strlcpy(f->description,"4:2:0, planar, Y-Cb-Cr",sizeof(f->description));
+                                        f->pixelformat = V4L2_PIX_FMT_YUV420;
+                                        strlcpy(f->description,"4:2:0, planar, Y-Cb-Cr",sizeof(f->description));
                                         break;
-                                default:
+                                default:
                                         return -EINVAL;
                         }
                         return 0;
                 }
 
-                case VIDIOC_G_FMT:
+                case VIDIOC_G_FMT:
                 {
-                        struct v4l2_format *f = arg;
+                        struct v4l2_format *f = arg;
 
                         PWC_DEBUG_IOCTL("ioctl(VIDIOC_G_FMT) return size %dx%d\n",pdev->image.x,pdev->image.y);
                         if (f->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
@@ -1008,7 +1008,7 @@ int pwc_video_do_ioctl(struct inode *inode, struct file *file,
                 case VIDIOC_TRY_FMT:
                         return pwc_vidioc_try_fmt(pdev, arg);
 
-                case VIDIOC_S_FMT:
+                case VIDIOC_S_FMT:
                         return pwc_vidioc_set_fmt(pdev, arg);
 
                 case VIDIOC_G_STD:
diff --git a/drivers/media/video/saa7134/saa6752hs.c b/drivers/media/video/saa7134/saa6752hs.c
index 0e0ba50946e8..a95878004f93 100644
--- a/drivers/media/video/saa7134/saa6752hs.c
+++ b/drivers/media/video/saa7134/saa6752hs.c
@@ -62,11 +62,11 @@ struct saa6752hs_state {
 
 enum saa6752hs_command {
         SAA6752HS_COMMAND_RESET = 0,
-        SAA6752HS_COMMAND_STOP = 1,
-        SAA6752HS_COMMAND_START = 2,
-        SAA6752HS_COMMAND_PAUSE = 3,
-        SAA6752HS_COMMAND_RECONFIGURE = 4,
-        SAA6752HS_COMMAND_SLEEP = 5,
+        SAA6752HS_COMMAND_STOP = 1,
+        SAA6752HS_COMMAND_START = 2,
+        SAA6752HS_COMMAND_PAUSE = 3,
+        SAA6752HS_COMMAND_RECONFIGURE = 4,
+        SAA6752HS_COMMAND_SLEEP = 5,
         SAA6752HS_COMMAND_RECONFIGURE_FORCE = 6,
 
         SAA6752HS_COMMAND_MAX
@@ -241,19 +241,19 @@ static int saa6752hs_set_bitrate(struct i2c_client* client,
         if (params->vi_bitrate.mode == V4L2_BITRATE_VBR) {
                 /* set the target bitrate */
                 buf[0] = 0x80;
-                buf[1] = params->vi_bitrate.target >> 8;
+                buf[1] = params->vi_bitrate.target >> 8;
                 buf[2] = params->vi_bitrate.target & 0xff;
                 i2c_master_send(client, buf, 3);
 
                 /* set the max bitrate */
                 buf[0] = 0x81;
-                buf[1] = params->vi_bitrate.max >> 8;
+                buf[1] = params->vi_bitrate.max >> 8;
                 buf[2] = params->vi_bitrate.max & 0xff;
                 i2c_master_send(client, buf, 3);
         } else {
                 /* set the target bitrate (no max bitrate for CBR) */
                 buf[0] = 0x81;
-                buf[1] = params->vi_bitrate.target >> 8;
+                buf[1] = params->vi_bitrate.target >> 8;
                 buf[2] = params->vi_bitrate.target & 0xff;
                 i2c_master_send(client, buf, 3);
         }
@@ -395,22 +395,22 @@ static int saa6752hs_init(struct i2c_client* client)
         buf[2] = 0x0D;
         i2c_master_send(client,buf,3);
 
-        /* Set minimum Q-scale {4} */
+        /* Set minimum Q-scale {4} */
         buf[0] = 0x82;
         buf[1] = 0x04;
         i2c_master_send(client,buf,2);
 
-        /* Set maximum Q-scale {12} */
+        /* Set maximum Q-scale {12} */
         buf[0] = 0x83;
         buf[1] = 0x0C;
         i2c_master_send(client,buf,2);
 
-        /* Set Output Protocol */
+        /* Set Output Protocol */
         buf[0] = 0xD0;
         buf[1] = 0x81;
         i2c_master_send(client,buf,2);
 
-        /* Set video output stream format {TS} */
+        /* Set video output stream format {TS} */
         buf[0] = 0xB0;
         buf[1] = 0x05;
         i2c_master_send(client,buf,2);
@@ -441,7 +441,7 @@ static int saa6752hs_init(struct i2c_client* client)
         localPMT[sizeof(PMT) - 2] = (crc >> 8) & 0xFF;
         localPMT[sizeof(PMT) - 1] = crc & 0xFF;
 
-        /* Set Audio PID */
+        /* Set Audio PID */
         buf[0] = 0xC1;
         buf[1] = (h->params.ts_pid_audio >> 8) & 0xFF;
         buf[2] = h->params.ts_pid_audio & 0xFF;
diff --git a/drivers/media/video/saa7134/saa7134-alsa.c b/drivers/media/video/saa7134/saa7134-alsa.c
index bb3e0ba946d3..d77e6a8d9432 100644
--- a/drivers/media/video/saa7134/saa7134-alsa.c
+++ b/drivers/media/video/saa7134/saa7134-alsa.c
@@ -818,7 +818,7 @@ static int snd_saa7134_capsrc_put(struct snd_kcontrol * kcontrol,
                                 break;
                 }
 
-                /* output xbar always main channel */
+                /* output xbar always main channel */
                 saa_dsp_writel(dev, SAA7133_DIGITAL_OUTPUT_SEL1, 0xbbbb10);
 
                 if (left || right) { // We've got data, turn the input on
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index e638b198786e..927413aded10 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -2160,7 +2160,7 @@ struct saa7134_board saa7134_boards[] = {
                 .radio = {
                           .name = name_radio,
                           .amux = LINE2,
-                },
+                },
         },
         [SAA7134_BOARD_GOTVIEW_7135] = {
                 /* Mike Baikov <mike@baikov.com> */
diff --git a/drivers/media/video/tda9875.c b/drivers/media/video/tda9875.c
index 5b6aa49bf4f2..827633b3bb43 100644
--- a/drivers/media/video/tda9875.c
+++ b/drivers/media/video/tda9875.c
@@ -164,7 +164,7 @@ static void do_tda9875_init(struct i2c_client *client)
         struct tda9875 *t = i2c_get_clientdata(client);
         dprintk("In tda9875_init\n");
         tda9875_write(client, TDA9875_CFG, 0xd0 ); /*reg de config 0 (reset)*/
-        tda9875_write(client, TDA9875_MSR, 0x03 );    /* Monitor 0b00000XXX*/
+        tda9875_write(client, TDA9875_MSR, 0x03 );    /* Monitor 0b00000XXX*/
         tda9875_write(client, TDA9875_C1MSB, 0x00 );  /*Car1(FM) MSB XMHz*/
         tda9875_write(client, TDA9875_C1MIB, 0x00 );  /*Car1(FM) MIB XMHz*/
         tda9875_write(client, TDA9875_C1LSB, 0x00 );  /*Car1(FM) LSB XMHz*/
diff --git a/drivers/media/video/tuner-simple.c b/drivers/media/video/tuner-simple.c
index 5d7abed71674..6da6f82b8c88 100644
--- a/drivers/media/video/tuner-simple.c
+++ b/drivers/media/video/tuner-simple.c
@@ -105,7 +105,7 @@ static int tuner_stereo(struct i2c_client *c)
 
         switch (t->type) {
                 case TUNER_PHILIPS_FM1216ME_MK3:
-                case TUNER_PHILIPS_FM1236_MK3:
+                case TUNER_PHILIPS_FM1236_MK3:
                 case TUNER_PHILIPS_FM1256_IH3:
                         stereo = ((status & TUNER_SIGNAL) == TUNER_STEREO_MK3);
                         break;