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

* git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (452 commits)
  V4L/DVB (7731): tuner-xc2028: fix signal strength calculus
  V4L/DVB (7730): tuner-xc2028: Fix SCODE load for MTS firmwares
  V4L/DVB (7729): Fix VIDIOCGAP corruption in ivtv
  V4L/DVB (7728): tea5761: bugzilla #10462: tea5761 autodetection code were broken
  V4L/DVB (7726): cx23885: Enable cx23417 support on the HVR1800
  V4L/DVB (7725): cx23885: Add generic cx23417 hardware encoder support
  V4L/DVB (7723): pvrusb2: Clean up input selection list generation in V4L interface
  V4L/DVB (7722): pvrusb2: Implement FM radio support for Gotview USB2.0 DVD 2
  V4L/DVB (7721): pvrusb2: Restructure cx23416 firmware loading to have a common exit point
  V4L/DVB (7720): pvrusb2: Fix bad error code on cx23416 firmware load failure
  V4L/DVB (7719): pvrusb2: Implement input selection enforcement
  V4L/DVB (7718): pvrusb2-dvb: update Kbuild selections
  V4L/DVB (7717): pvrusb2-dvb: add DVB-T support for Hauppauge pvrusb2 model 73xxx
  V4L/DVB (7716): pvrusb2: clean up global functions
  V4L/DVB (7715): pvrusb2: Clean out all use of __FUNCTION__
  V4L/DVB (7714): pvrusb2: Fix hang on module removal
  V4L/DVB (7713): pvrusb2: Implement cleaner DVB kernel thread shutdown
  V4L/DVB (7712): pvrusb2: Close connect/disconnect race
  V4L/DVB (7711): pvrusb2: Fix race on module unload
  V4L/DVB (7710): pvrusb2: Implement critical digital streaming quirk for onair devices
  ...

diff --combined drivers/media/video/cx88/cx88-alsa.c
index 03feb5b49e1b270428cdcb38ae938893324eb0d9,87c751a9a4312f5f106f727cd8d47aff9650db91..e976fc6bef7ccc7c6ec747fc5594f7a720aff505
--- 1/drivers/media/video/cx88/cx88-alsa.c
--- 2/drivers/media/video/cx88/cx88-alsa.c
+++ b/drivers/media/video/cx88/cx88-alsa.c
@@@ -283,7 -283,7 +283,7 @@@ static int dsp_buffer_free(snd_cx88_car
        BUG_ON(!chip->dma_size);
  
        dprintk(2,"Freeing buffer\n");
-       videobuf_pci_dma_unmap(chip->pci, chip->dma_risc);
+       videobuf_sg_dma_unmap(&chip->pci->dev, chip->dma_risc);
        videobuf_dma_free(chip->dma_risc);
        btcx_riscmem_free(chip->pci,&chip->buf->risc);
        kfree(chip->buf);
@@@ -385,7 -385,7 +385,7 @@@ static int snd_cx88_hw_params(struct sn
        BUG_ON(!chip->dma_size);
        BUG_ON(chip->num_periods & (chip->num_periods-1));
  
-       buf = videobuf_pci_alloc(sizeof(*buf));
+       buf = videobuf_sg_alloc(sizeof(*buf));
        if (NULL == buf)
                return -ENOMEM;
  
@@@ -396,14 -396,14 +396,14 @@@
        buf->vb.height = chip->num_periods;
        buf->vb.size   = chip->dma_size;
  
-       dma=videobuf_to_dma(&buf->vb);
+       dma = videobuf_to_dma(&buf->vb);
        videobuf_dma_init(dma);
        ret = videobuf_dma_init_kernel(dma, PCI_DMA_FROMDEVICE,
                        (PAGE_ALIGN(buf->vb.size) >> PAGE_SHIFT));
        if (ret < 0)
                goto error;
  
-       ret = videobuf_pci_dma_map(chip->pci,dma);
+       ret = videobuf_sg_dma_map(&chip->pci->dev, dma);
        if (ret < 0)
                goto error;
  
@@@ -494,7 -494,7 +494,7 @@@ static snd_pcm_uframes_t snd_cx88_point
  
        count = atomic_read(&chip->count);
  
- //    dprintk(2, "%s - count %d (+%u), period %d, frame %lu\n", __FUNCTION__,
+ //    dprintk(2, "%s - count %d (+%u), period %d, frame %lu\n", __func__,
  //            count, new, count & (runtime->periods-1),
  //            runtime->period_size * (count & (runtime->periods-1)));
        return runtime->period_size * (count & (runtime->periods-1));
@@@ -690,8 -690,10 +690,8 @@@ MODULE_DEVICE_TABLE(pci, cx88_audio_pci
  static int snd_cx88_free(snd_cx88_card_t *chip)
  {
  
 -      if (chip->irq >= 0){
 -              synchronize_irq(chip->irq);
 +      if (chip->irq >= 0)
                free_irq(chip->irq, chip);
 -      }
  
        cx88_core_put(chip->core,chip->pci);
  

diff --combined drivers/media/video/saa7134/saa7134-alsa.c
index ec6bdb9680a3b2289975e3c8f5b1554e7b0f4ff7,048081be91fe1dc50185ecd2886c7cf86da51ff2..ba3082422a01915dce20bce15832c495e9555d89
--- 1/drivers/media/video/saa7134/saa7134-alsa.c
--- 2/drivers/media/video/saa7134/saa7134-alsa.c
+++ b/drivers/media/video/saa7134/saa7134-alsa.c
@@@ -31,7 -31,7 +31,7 @@@
  #include "saa7134.h"
  #include "saa7134-reg.h"
  
- static unsigned int debug  = 0;
+ static unsigned int debug;
  module_param(debug, int, 0644);
  MODULE_PARM_DESC(debug,"enable debug messages [alsa]");
  
@@@ -503,7 -503,7 +503,7 @@@ static int snd_card_saa7134_hw_params(s
        /* release the old buffer */
        if (substream->runtime->dma_area) {
                saa7134_pgtable_free(dev->pci, &dev->dmasound.pt);
-               videobuf_pci_dma_unmap(dev->pci, &dev->dmasound.dma);
+               videobuf_sg_dma_unmap(&dev->pci->dev, &dev->dmasound.dma);
                dsp_buffer_free(dev);
                substream->runtime->dma_area = NULL;
        }
@@@ -519,12 -519,12 +519,12 @@@
                return err;
        }
  
-       if (0 != (err = videobuf_pci_dma_map(dev->pci, &dev->dmasound.dma))) {
+       if (0 != (err = videobuf_sg_dma_map(&dev->pci->dev, &dev->dmasound.dma))) {
                dsp_buffer_free(dev);
                return err;
        }
        if (0 != (err = saa7134_pgtable_alloc(dev->pci,&dev->dmasound.pt))) {
-               videobuf_pci_dma_unmap(dev->pci, &dev->dmasound.dma);
+               videobuf_sg_dma_unmap(&dev->pci->dev, &dev->dmasound.dma);
                dsp_buffer_free(dev);
                return err;
        }
@@@ -533,7 -533,7 +533,7 @@@
                                                dev->dmasound.dma.sglen,
                                                0))) {
                saa7134_pgtable_free(dev->pci, &dev->dmasound.pt);
-               videobuf_pci_dma_unmap(dev->pci, &dev->dmasound.dma);
+               videobuf_sg_dma_unmap(&dev->pci->dev, &dev->dmasound.dma);
                dsp_buffer_free(dev);
                return err;
        }
@@@ -569,7 -569,7 +569,7 @@@ static int snd_card_saa7134_hw_free(str
  
        if (substream->runtime->dma_area) {
                saa7134_pgtable_free(dev->pci, &dev->dmasound.pt);
-               videobuf_pci_dma_unmap(dev->pci, &dev->dmasound.dma);
+               videobuf_sg_dma_unmap(&dev->pci->dev, &dev->dmasound.dma);
                dsp_buffer_free(dev);
                substream->runtime->dma_area = NULL;
        }
@@@ -954,8 -954,10 +954,8 @@@ static void snd_saa7134_free(struct snd
        if (chip->dev->dmasound.priv_data == NULL)
                return;
  
 -      if (chip->irq >= 0) {
 -              synchronize_irq(chip->irq);
 +      if (chip->irq >= 0)
                free_irq(chip->irq, &chip->dev->dmasound);
 -      }
  
        chip->dev->dmasound.priv_data = NULL;