ALSA: remove deprecated use of pci api

Replace occurences of the pci api by appropriate call to the dma api.

A simplified version of the semantic patch that finds this problem is as
follows: (http://coccinelle.lip6.fr)

@deprecated@
idexpression id;
position p;
@@

(
  pci_dma_supported@p ( id, ...)
|
  pci_alloc_consistent@p ( id, ...)
)

@bad1@
idexpression id;
position deprecated.p;
@@
...when != &id->dev
   when != pci_get_drvdata ( id )
   when != pci_enable_device ( id )
(
  pci_dma_supported@p ( id, ...)
|
  pci_alloc_consistent@p ( id, ...)
)

@depends on !bad1@
idexpression id;
expression direction;
position deprecated.p;
@@

(
- pci_dma_supported@p ( id,
+ dma_supported ( &id->dev,
...
+ , GFP_ATOMIC
  )
|
- pci_alloc_consistent@p ( id,
+ dma_alloc_coherent ( &id->dev,
...
+ , GFP_ATOMIC
  )
)

Signed-off-by: Quentin Lambert <lambert.quentin@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/pci/ad1889.c b/sound/pci/ad1889.c
index 66ddd98..1fc6d8b 100644 (file)
--- a/sound/pci/ad1889.c
+++ b/sound/pci/ad1889.c
@@ -898,8 +898,8 @@ snd_ad1889_create(struct snd_card *card,
                return err;
 
        /* check PCI availability (32bit DMA) */
-       if (pci_set_dma_mask(pci, DMA_BIT_MASK(32)) < 0 ||
-           pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(32)) < 0) {
+       if (dma_set_mask(&pci->dev, DMA_BIT_MASK(32)) < 0 ||
+           dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(32)) < 0) {
                dev_err(card->dev, "error setting 32-bit DMA mask.\n");
                pci_disable_device(pci);
                return -ENXIO;

diff --cc sound/pci/ali5451/ali5451.c
Simple merge

diff --cc sound/pci/als300.c
Simple merge

diff --cc sound/pci/als4000.c
Simple merge

diff --cc sound/pci/au88x0/au88x0.c
Simple merge

diff --cc sound/pci/aw2/aw2-alsa.c
Simple merge

diff --cc sound/pci/azt3328.c
Simple merge

diff --cc sound/pci/ca0106/ca0106_main.c
Simple merge

diff --cc sound/pci/cs5535audio/cs5535audio.c
Simple merge

diff --cc sound/pci/ctxfi/cthw20k1.c
Simple merge

diff --cc sound/pci/ctxfi/cthw20k2.c
Simple merge

diff --cc sound/pci/emu10k1/emu10k1_main.c
Simple merge

diff --cc sound/pci/es1938.c
Simple merge

diff --cc sound/pci/es1968.c
Simple merge

diff --cc sound/pci/hda/hda_intel.c
Simple merge

diff --cc sound/pci/ice1712/ice1712.c
Simple merge

diff --cc sound/pci/lx6464es/lx6464es.c
Simple merge

diff --cc sound/pci/maestro3.c
Simple merge

diff --cc sound/pci/mixart/mixart.c
Simple merge

diff --cc sound/pci/pcxhr/pcxhr.c
Simple merge

diff --cc sound/pci/sis7019.c
Simple merge

diff --cc sound/pci/sonicvibes.c
Simple merge

diff --cc sound/pci/trident/trident_main.c
Simple merge