Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb

* master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (33 commits)
  V4L/DVB (3604): V4l printk fix
  V4L/DVB (3599c): Whitespace cleanups under Documentation/video4linux
  V4L/DVB (3599b): Whitespace cleanups under drivers/media
  V4L/DVB (3599a): Move drivers/usb/media to drivers/media/video
  V4L/DVB (3599): Implement new routing commands for wm8775 and cs53l32a.
  V4L/DVB (3598): Add bit algorithm adapter for the Conexant CX2341X boards.
  V4L/DVB (3597): Vivi: fix warning: implicit declaration of function 'in_interrupt'
  V4L/DVB (3588): Remove VIDIOC_G/S_AUDOUT from msp3400
  V4L/DVB (3587): Always wake thread after routing change.
  V4L/DVB (3584): Implement V4L2_TUNER_MODE_LANG1_LANG2 audio mode
  V4L/DVB (3582): Implement correct msp3400 input/output routing
  V4L/DVB (3581): Add new media/msp3400.h header containing the routing macros
  V4L/DVB (3580): Last round of msp3400 cleanups before adding routing commands
  V4L/DVB (3579): Move msp_modus to msp3400-kthreads, add JP and KR std detection
  V4L/DVB (3578): Make scart definitions easier to handle
  V4L/DVB (3577): Cleanup audio input handling
  V4L/DVB (3575): Cxusb: fix i2c debug messages for bluebird devices
  V4L/DVB (3574): Cxusb: fix debug messages
  V4L/DVB (3573): Cxusb: remove FIXME: comment in bluebird_patch_dvico_firmware_download
  V4L/DVB (3572): Cxusb: conditionalize gpio write for the medion box
  ...

1 files changed, 23 insertions, 23 deletions

diff --git a/drivers/media/video/zr36120.c b/drivers/media/video/zr36120.c
index 417a999afee3..6ac3b6740089 100644
--- a/drivers/media/video/zr36120.c
+++ b/drivers/media/video/zr36120.c
@@ -316,7 +316,7 @@ DEBUG(printk(CARD_DEBUG "%p added to queue\n",CARD,item));
                                 item->status = FBUFFER_BUSY;
                                 if (!lastitem)
                                         ztv->workqueue = item;
-                                else 
+                                else
                                         lastitem->next = item;
                                 lastitem = item;
                         }
@@ -516,7 +516,7 @@ DEBUG(printk(KERN_DEBUG "       %d: clip(%d,%d,%d,%d)\n", i,vp->x,vp->y,vp->widt
         zraor((ztv->vidInterlace*ystep)<<0,~ZORAN_OCR_MASKSTRIDE,ZORAN_OCR);
 }
 
-struct tvnorm 
+struct tvnorm
 {
         u16 Wt, Wa, Ht, Ha, HStart, VStart;
 };
@@ -660,7 +660,7 @@ DEBUG(printk(KERN_DEBUG "       Y: scale=0, start=%d, end=%d\n", Hstart, Hend));
                 int HorDcm = 64-X;
                 int hcrop1 = 2*(Wa-We)/4;
                 /*
-                 * BUGFIX: Juha Nurmela <junki@qn-lpr2-165.quicknet.inet.fi> 
+                 * BUGFIX: Juha Nurmela <junki@qn-lpr2-165.quicknet.inet.fi>
                  * found the solution to the color phase shift.
                  * See ChangeLog for the full explanation)
                  */
@@ -812,12 +812,12 @@ void zoran_close(struct video_device* dev)
 
         zoran_common_close(ztv);
 
-        /*
-         *      This is sucky but right now I can't find a good way to
-         *      be sure its safe to free the buffer. We wait 5-6 fields
-         *      which is more than sufficient to be sure.
-         */
-        msleep(100);                    /* Wait 1/10th of a second */
+        /*
+         *      This is sucky but right now I can't find a good way to
+         *      be sure its safe to free the buffer. We wait 5-6 fields
+         *      which is more than sufficient to be sure.
+         */
+        msleep(100);                    /* Wait 1/10th of a second */
 
         /* free the allocated framebuffer */
         bfree(ztv->fbuffer, ZORAN_MAX_FBUFSIZE);
@@ -1436,7 +1436,7 @@ int zoran_ioctl(struct video_device* dev, unsigned int cmd, void *arg)
 
          /* Why isn't this in the API?
           * And why doesn't it take a buffer number?
-         case BTTV_FIELDNR: 
+         case BTTV_FIELDNR:
          {
                 unsigned long v = ztv->lastfieldnr;
                 if (copy_to_user(arg,&v,sizeof(v)))
@@ -1557,12 +1557,12 @@ void vbi_close(struct video_device *dev)
 
         zoran_common_close(ztv);
 
-        /*
-         *      This is sucky but right now I can't find a good way to
-         *      be sure its safe to free the buffer. We wait 5-6 fields
-         *      which is more than sufficient to be sure.
-         */
-        msleep(100);                    /* Wait 1/10th of a second */
+        /*
+         *      This is sucky but right now I can't find a good way to
+         *      be sure its safe to free the buffer. We wait 5-6 fields
+         *      which is more than sufficient to be sure.
+         */
+        msleep(100);                    /* Wait 1/10th of a second */
 
         for (item=ztv->readinfo; item!=ztv->readinfo+ZORAN_VBI_BUFFERS; item++)
         {
@@ -1620,7 +1620,7 @@ long vbi_read(struct video_device* dev, char* buf, unsigned long count, int nonb
                         write_unlock_irq(&ztv->lock);
                         return -EWOULDBLOCK;
                 }
-                
+
                 /* mark the unused buffer as wanted */
                 unused->status = FBUFFER_BUSY;
                 unused->next = 0;
@@ -1671,7 +1671,7 @@ long vbi_read(struct video_device* dev, char* buf, unsigned long count, int nonb
         if (count == 2*19*2048) {
                 /*
                  * Extreme HACK, old VBI programs expect 2048 points
-                 * of data, and we only got 864 orso. Double each 
+                 * of data, and we only got 864 orso. Double each
                  * datapoint and clear the rest of the line.
                  * This way we have appear to have a
                  * sample_frequency of 29.5 Mc.
@@ -1956,7 +1956,7 @@ int __init init_zoran(int card)
                 zrand(~ZORAN_VDC_TRICOM, ZORAN_VDC);
 
         /* external FL determines TOP frame */
-        zror(ZORAN_VFEC_EXTFL, ZORAN_VFEC); 
+        zror(ZORAN_VFEC_EXTFL, ZORAN_VFEC);
 
         /* set HSpol */
         if (ztv->card->hsync_pos)
@@ -2012,7 +2012,7 @@ void release_zoran(int max)
         struct zoran *ztv;
         int i;
 
-        for (i=0;i<max; i++) 
+        for (i=0;i<max; i++)
         {
                 ztv = &zorans[i];
 
@@ -2029,7 +2029,7 @@ void release_zoran(int max)
 
                 /* free it */
                 free_irq(ztv->dev->irq,ztv);
- 
+
                 /* unregister i2c_bus */
                 i2c_unregister_bus((&ztv->i2c));
 
@@ -2050,7 +2050,7 @@ void __exit zr36120_exit(void)
 int __init zr36120_init(void)
 {
         int     card;
- 
+
         handle_chipset();
         zoran_cards = find_zoran();
         if (zoran_cards<0)
@@ -2063,7 +2063,7 @@ int __init zr36120_init(void)
                         /* only release the zorans we have registered */
                         release_zoran(card);
                         return -EIO;
-                } 
+                }
         }
         return 0;
 }