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 --git a/sound/pci/ali5451/ali5451.c b/sound/pci/ali5451/ali5451.c
index c8d4995..36470af 100644 (file)
--- a/sound/pci/ali5451/ali5451.c
+++ b/sound/pci/ali5451/ali5451.c
@@ -2105,8 +2105,8 @@ static int snd_ali_create(struct snd_card *card,
        if (err < 0)
                return err;
        /* check, if we can restrict PCI DMA transfers to 31 bits */
-       if (pci_set_dma_mask(pci, DMA_BIT_MASK(31)) < 0 ||
-           pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(31)) < 0) {
+       if (dma_set_mask(&pci->dev, DMA_BIT_MASK(31)) < 0 ||
+           dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(31)) < 0) {
                dev_err(card->dev,
                        "architecture does not support 31bit PCI busmaster DMA\n");
                pci_disable_device(pci);

diff --git a/sound/pci/als300.c b/sound/pci/als300.c
index 57e034f..add3176 100644 (file)
--- a/sound/pci/als300.c
+++ b/sound/pci/als300.c
@@ -658,8 +658,8 @@ static int snd_als300_create(struct snd_card *card,
        if ((err = pci_enable_device(pci)) < 0)
                return err;
 
-       if (pci_set_dma_mask(pci, DMA_BIT_MASK(28)) < 0 ||
-               pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(28)) < 0) {
+       if (dma_set_mask(&pci->dev, DMA_BIT_MASK(28)) < 0 ||
+               dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(28)) < 0) {
                dev_err(card->dev, "error setting 28bit DMA mask\n");
                pci_disable_device(pci);
                return -ENXIO;

diff --git a/sound/pci/als4000.c b/sound/pci/als4000.c
index a3dea46..ff39a0c 100644 (file)
--- a/sound/pci/als4000.c
+++ b/sound/pci/als4000.c
@@ -871,8 +871,8 @@ static int snd_card_als4000_probe(struct pci_dev *pci,
                return err;
        }
        /* check, if we can restrict PCI DMA transfers to 24 bits */
-       if (pci_set_dma_mask(pci, DMA_BIT_MASK(24)) < 0 ||
-           pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(24)) < 0) {
+       if (dma_set_mask(&pci->dev, DMA_BIT_MASK(24)) < 0 ||
+           dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(24)) < 0) {
                dev_err(&pci->dev, "architecture does not support 24bit PCI busmaster DMA\n");
                pci_disable_device(pci);
                return -ENXIO;

diff --git a/sound/pci/au88x0/au88x0.c b/sound/pci/au88x0/au88x0.c
index 9963691..3209218 100644 (file)
--- a/sound/pci/au88x0/au88x0.c
+++ b/sound/pci/au88x0/au88x0.c
@@ -150,8 +150,8 @@ snd_vortex_create(struct snd_card *card, struct pci_dev *pci, vortex_t ** rchip)
        // check PCI availability (DMA).
        if ((err = pci_enable_device(pci)) < 0)
                return err;
-       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 to set DMA mask\n");
                pci_disable_device(pci);
                return -ENXIO;

diff --git a/sound/pci/aw2/aw2-alsa.c b/sound/pci/aw2/aw2-alsa.c
index 8d2fee7..1677143 100644 (file)
--- a/sound/pci/aw2/aw2-alsa.c
+++ b/sound/pci/aw2/aw2-alsa.c
@@ -258,8 +258,8 @@ static int snd_aw2_create(struct snd_card *card,
        pci_set_master(pci);
 
        /* 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, "Impossible to set 32bit mask DMA\n");
                pci_disable_device(pci);
                return -ENXIO;

diff --git a/sound/pci/azt3328.c b/sound/pci/azt3328.c
index 33b2a0a..07a4acc 100644 (file)
--- a/sound/pci/azt3328.c
+++ b/sound/pci/azt3328.c
@@ -2420,8 +2420,8 @@ snd_azf3328_create(struct snd_card *card,
        chip->irq = -1;
 
        /* check if we can restrict PCI DMA transfers to 24 bits */
-       if (pci_set_dma_mask(pci, DMA_BIT_MASK(24)) < 0 ||
-           pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(24)) < 0) {
+       if (dma_set_mask(&pci->dev, DMA_BIT_MASK(24)) < 0 ||
+           dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(24)) < 0) {
                dev_err(card->dev,
                        "architecture does not support 24bit PCI busmaster DMA\n"
                );

diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c
index dd75b75..0b31732 100644 (file)
--- a/sound/pci/ca0106/ca0106_main.c
+++ b/sound/pci/ca0106/ca0106_main.c
@@ -1676,8 +1676,8 @@ static int snd_ca0106_create(int dev, struct snd_card *card,
        err = pci_enable_device(pci);
        if (err < 0)
                return err;
-       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 to set 32bit mask DMA\n");
                pci_disable_device(pci);
                return -ENXIO;

diff --git a/sound/pci/cs5535audio/cs5535audio.c b/sound/pci/cs5535audio/cs5535audio.c
index 963b912..de409cd 100644 (file)
--- a/sound/pci/cs5535audio/cs5535audio.c
+++ b/sound/pci/cs5535audio/cs5535audio.c
@@ -289,8 +289,8 @@ static int snd_cs5535audio_create(struct snd_card *card,
        if ((err = pci_enable_device(pci)) < 0)
                return err;
 
-       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_warn(card->dev, "unable to get 32bit dma\n");
                err = -ENXIO;
                goto pcifail;

diff --git a/sound/pci/ctxfi/cthw20k1.c b/sound/pci/ctxfi/cthw20k1.c
index 1cac55f..9667cbf 100644 (file)
--- a/sound/pci/ctxfi/cthw20k1.c
+++ b/sound/pci/ctxfi/cthw20k1.c
@@ -1910,8 +1910,8 @@ static int hw_card_start(struct hw *hw)
                return err;
 
        /* Set DMA transfer mask */
-       if (pci_set_dma_mask(pci, CT_XFI_DMA_MASK) < 0 ||
-           pci_set_consistent_dma_mask(pci, CT_XFI_DMA_MASK) < 0) {
+       if (dma_set_mask(&pci->dev, CT_XFI_DMA_MASK) < 0 ||
+           dma_set_coherent_mask(&pci->dev, CT_XFI_DMA_MASK) < 0) {
                dev_err(hw->card->dev,
                        "architecture does not support PCI busmaster DMA with mask 0x%llx\n",
                        CT_XFI_DMA_MASK);

diff --git a/sound/pci/ctxfi/cthw20k2.c b/sound/pci/ctxfi/cthw20k2.c
index 955ad87..9dc2950 100644 (file)
--- a/sound/pci/ctxfi/cthw20k2.c
+++ b/sound/pci/ctxfi/cthw20k2.c
@@ -2035,8 +2035,8 @@ static int hw_card_start(struct hw *hw)
                return err;
 
        /* Set DMA transfer mask */
-       if (pci_set_dma_mask(pci, CT_XFI_DMA_MASK) < 0 ||
-           pci_set_consistent_dma_mask(pci, CT_XFI_DMA_MASK) < 0) {
+       if (dma_set_mask(&pci->dev, CT_XFI_DMA_MASK) < 0 ||
+           dma_set_coherent_mask(&pci->dev, CT_XFI_DMA_MASK) < 0) {
                dev_err(hw->card->dev,
                        "architecture does not support PCI busmaster DMA with mask 0x%llx\n",
                        CT_XFI_DMA_MASK);

diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c
index 54079f5..e66103a 100644 (file)
--- a/sound/pci/emu10k1/emu10k1_main.c
+++ b/sound/pci/emu10k1/emu10k1_main.c
@@ -1904,8 +1904,8 @@ int snd_emu10k1_create(struct snd_card *card,
 
        /* set the DMA transfer mask */
        emu->dma_mask = is_audigy ? AUDIGY_DMA_MASK : EMU10K1_DMA_MASK;
-       if (pci_set_dma_mask(pci, emu->dma_mask) < 0 ||
-           pci_set_consistent_dma_mask(pci, emu->dma_mask) < 0) {
+       if (dma_set_mask(&pci->dev, emu->dma_mask) < 0 ||
+           dma_set_coherent_mask(&pci->dev, emu->dma_mask) < 0) {
                dev_err(card->dev,
                        "architecture does not support PCI busmaster DMA with mask 0x%lx\n",
                        emu->dma_mask);

diff --git a/sound/pci/es1938.c b/sound/pci/es1938.c
index e1858d9..8963d76 100644 (file)
--- a/sound/pci/es1938.c
+++ b/sound/pci/es1938.c
@@ -1580,8 +1580,8 @@ static int snd_es1938_create(struct snd_card *card,
        if ((err = pci_enable_device(pci)) < 0)
                return err;
         /* check, if we can restrict PCI DMA transfers to 24 bits */
-       if (pci_set_dma_mask(pci, DMA_BIT_MASK(24)) < 0 ||
-           pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(24)) < 0) {
+       if (dma_set_mask(&pci->dev, DMA_BIT_MASK(24)) < 0 ||
+           dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(24)) < 0) {
                dev_err(card->dev,
                        "architecture does not support 24bit PCI busmaster DMA\n");
                pci_disable_device(pci);

diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c
index 059f384..e0d9363 100644 (file)
--- a/sound/pci/es1968.c
+++ b/sound/pci/es1968.c
@@ -2689,8 +2689,8 @@ static int snd_es1968_create(struct snd_card *card,
        if ((err = pci_enable_device(pci)) < 0)
                return err;
        /* check, if we can restrict PCI DMA transfers to 28 bits */
-       if (pci_set_dma_mask(pci, DMA_BIT_MASK(28)) < 0 ||
-           pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(28)) < 0) {
+       if (dma_set_mask(&pci->dev, DMA_BIT_MASK(28)) < 0 ||
+           dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(28)) < 0) {
                dev_err(card->dev,
                        "architecture does not support 28bit PCI busmaster DMA\n");
                pci_disable_device(pci);

diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index e1c2105..626b5b2 100644 (file)
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -1528,11 +1528,11 @@ static int azx_first_init(struct azx *chip)
        /* allow 64bit DMA address if supported by H/W */
        if (!(gcap & AZX_GCAP_64OK))
                dma_bits = 32;
-       if (!pci_set_dma_mask(pci, DMA_BIT_MASK(dma_bits))) {
-               pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(dma_bits));
+       if (!dma_set_mask(&pci->dev, DMA_BIT_MASK(dma_bits))) {
+               dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(dma_bits));
        } else {
-               pci_set_dma_mask(pci, DMA_BIT_MASK(32));
-               pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(32));
+               dma_set_mask(&pci->dev, DMA_BIT_MASK(32));
+               dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(32));
        }
 
        /* read number of streams from GCAP register instead of using

diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c
index f7b1523..8ae3bb7 100644 (file)
--- a/sound/pci/ice1712/ice1712.c
+++ b/sound/pci/ice1712/ice1712.c
@@ -2530,8 +2530,8 @@ static int snd_ice1712_create(struct snd_card *card,
        if (err < 0)
                return err;
        /* check, if we can restrict PCI DMA transfers to 28 bits */
-       if (pci_set_dma_mask(pci, DMA_BIT_MASK(28)) < 0 ||
-           pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(28)) < 0) {
+       if (dma_set_mask(&pci->dev, DMA_BIT_MASK(28)) < 0 ||
+           dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(28)) < 0) {
                dev_err(card->dev,
                        "architecture does not support 28bit PCI busmaster DMA\n");
                pci_disable_device(pci);

diff --git a/sound/pci/lx6464es/lx6464es.c b/sound/pci/lx6464es/lx6464es.c
index 601315a..32c6f6b 100644 (file)
--- a/sound/pci/lx6464es/lx6464es.c
+++ b/sound/pci/lx6464es/lx6464es.c
@@ -981,7 +981,7 @@ static int snd_lx6464es_create(struct snd_card *card,
        pci_set_master(pci);
 
        /* check if we can restrict PCI DMA transfers to 32 bits */
-       err = pci_set_dma_mask(pci, DMA_BIT_MASK(32));
+       err = dma_set_mask(&pci->dev, DMA_BIT_MASK(32));
        if (err < 0) {
                dev_err(card->dev,
                        "architecture does not support 32bit PCI busmaster DMA\n");

diff --git a/sound/pci/maestro3.c b/sound/pci/maestro3.c
index 9be6609..72e89ce 100644 (file)
--- a/sound/pci/maestro3.c
+++ b/sound/pci/maestro3.c
@@ -2537,8 +2537,8 @@ snd_m3_create(struct snd_card *card, struct pci_dev *pci,
                return -EIO;
 
        /* check, if we can restrict PCI DMA transfers to 28 bits */
-       if (pci_set_dma_mask(pci, DMA_BIT_MASK(28)) < 0 ||
-           pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(28)) < 0) {
+       if (dma_set_mask(&pci->dev, DMA_BIT_MASK(28)) < 0 ||
+           dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(28)) < 0) {
                dev_err(card->dev,
                        "architecture does not support 28bit PCI busmaster DMA\n");
                pci_disable_device(pci);

diff --git a/sound/pci/mixart/mixart.c b/sound/pci/mixart/mixart.c
index c3a9f39..bc81b9f 100644 (file)
--- a/sound/pci/mixart/mixart.c
+++ b/sound/pci/mixart/mixart.c
@@ -1269,7 +1269,7 @@ static int snd_mixart_probe(struct pci_dev *pci,
        pci_set_master(pci);
 
        /* check if we can restrict PCI DMA transfers to 32 bits */
-       if (pci_set_dma_mask(pci, DMA_BIT_MASK(32)) < 0) {
+       if (dma_set_mask(&pci->dev, DMA_BIT_MASK(32)) < 0) {
                dev_err(&pci->dev,
                        "architecture does not support 32bit PCI busmaster DMA\n");
                pci_disable_device(pci);

diff --git a/sound/pci/pcxhr/pcxhr.c b/sound/pci/pcxhr/pcxhr.c
index c6092e4..9293235 100644 (file)
--- a/sound/pci/pcxhr/pcxhr.c
+++ b/sound/pci/pcxhr/pcxhr.c
@@ -1537,7 +1537,7 @@ static int pcxhr_probe(struct pci_dev *pci,
        pci_set_master(pci);
 
        /* check if we can restrict PCI DMA transfers to 32 bits */
-       if (pci_set_dma_mask(pci, DMA_BIT_MASK(32)) < 0) {
+       if (dma_set_mask(&pci->dev, DMA_BIT_MASK(32)) < 0) {
                dev_err(&pci->dev,
                        "architecture does not support 32bit PCI busmaster DMA\n");
                pci_disable_device(pci);

diff --git a/sound/pci/sis7019.c b/sound/pci/sis7019.c
index efe669b..f3860b8 100644 (file)
--- a/sound/pci/sis7019.c
+++ b/sound/pci/sis7019.c
@@ -383,9 +383,9 @@ static void __sis_map_silence(struct sis7019 *sis)
 {
        /* Helper function: must hold sis->voice_lock on entry */
        if (!sis->silence_users)
-               sis->silence_dma_addr = pci_map_single(sis->pci,
+               sis->silence_dma_addr = dma_map_single(&sis->pci->dev,
                                                sis->suspend_state[0],
-                                               4096, PCI_DMA_TODEVICE);
+                                               4096, DMA_TO_DEVICE);
        sis->silence_users++;
 }
 
@@ -394,8 +394,8 @@ static void __sis_unmap_silence(struct sis7019 *sis)
        /* Helper function: must hold sis->voice_lock on entry */
        sis->silence_users--;
        if (!sis->silence_users)
-               pci_unmap_single(sis->pci, sis->silence_dma_addr, 4096,
-                                       PCI_DMA_TODEVICE);
+               dma_unmap_single(&sis->pci->dev, sis->silence_dma_addr, 4096,
+                                       DMA_TO_DEVICE);
 }
 
 static void sis_free_voice(struct sis7019 *sis, struct voice *voice)
@@ -1325,7 +1325,7 @@ static int sis_chip_create(struct snd_card *card,
        if (rc)
                goto error_out;
 
-       rc = pci_set_dma_mask(pci, DMA_BIT_MASK(30));
+       rc = dma_set_mask(&pci->dev, DMA_BIT_MASK(30));
        if (rc < 0) {
                dev_err(&pci->dev, "architecture does not support 30-bit PCI busmaster DMA");
                goto error_out_enabled;

diff --git a/sound/pci/sonicvibes.c b/sound/pci/sonicvibes.c
index 0f40624..1b6fad7 100644 (file)
--- a/sound/pci/sonicvibes.c
+++ b/sound/pci/sonicvibes.c
@@ -1259,8 +1259,8 @@ static int snd_sonicvibes_create(struct snd_card *card,
        if ((err = pci_enable_device(pci)) < 0)
                return err;
        /* check, if we can restrict PCI DMA transfers to 24 bits */
-        if (pci_set_dma_mask(pci, DMA_BIT_MASK(24)) < 0 ||
-           pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(24)) < 0) {
+       if (dma_set_mask(&pci->dev, DMA_BIT_MASK(24)) < 0 ||
+           dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(24)) < 0) {
                dev_err(card->dev,
                        "architecture does not support 24bit PCI busmaster DMA\n");
                pci_disable_device(pci);

diff --git a/sound/pci/trident/trident_main.c b/sound/pci/trident/trident_main.c
index b72be03..599d2b7 100644 (file)
--- a/sound/pci/trident/trident_main.c
+++ b/sound/pci/trident/trident_main.c
@@ -3551,8 +3551,8 @@ int snd_trident_create(struct snd_card *card,
        if ((err = pci_enable_device(pci)) < 0)
                return err;
        /* check, if we can restrict PCI DMA transfers to 30 bits */
-       if (pci_set_dma_mask(pci, DMA_BIT_MASK(30)) < 0 ||
-           pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(30)) < 0) {
+       if (dma_set_mask(&pci->dev, DMA_BIT_MASK(30)) < 0 ||
+           dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(30)) < 0) {
                dev_err(card->dev,
                        "architecture does not support 30bit PCI busmaster DMA\n");
                pci_disable_device(pci);