Commit 412b979c authored by Quentin Lambert's avatar Quentin Lambert Committed by Takashi Iwai
Browse files

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: default avatarQuentin Lambert <lambert.quentin@gmail.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 30477555

sound/pci/ad1889.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

sound/pci/ali5451/ali5451.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

sound/pci/als300.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

sound/pci/als4000.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

sound/pci/au88x0/au88x0.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE