Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c54c719b authored by Quentin Lambert's avatar Quentin Lambert Committed by Tejun Heo
Browse files

ata: 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 avatarTejun Heo <tj@kernel.org>
parent 9a1e75e1

drivers/ata/acard-ahci.c

+5 −5
Original line number Diff line number Diff line
@@ -181,10 +181,10 @@ static int acard_ahci_configure_dma_masks(struct pci_dev *pdev, int using_dac) 
	int rc;



	if (using_dac &&

	    !pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) {

		rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));

	    !dma_set_mask(&pdev->dev, DMA_BIT_MASK(64))) {

		rc = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64));

		if (rc) {

			rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));

			rc = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));

			if (rc) {

				dev_err(&pdev->dev,

					   "64-bit DMA enable failed\n");
@@ -192,12 +192,12 @@ static int acard_ahci_configure_dma_masks(struct pci_dev *pdev, int using_dac) 
			}

		}

	} else {

		rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));

		rc = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));

		if (rc) {

			dev_err(&pdev->dev, "32-bit DMA enable failed\n");

			return rc;

		}

		rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));

		rc = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));

		if (rc) {

			dev_err(&pdev->dev,

				"32-bit consistent DMA enable failed\n");

drivers/ata/ahci.c

+5 −5
Original line number Diff line number Diff line
@@ -738,10 +738,10 @@ static int ahci_configure_dma_masks(struct pci_dev *pdev, int using_dac) 
		return 0;



	if (using_dac &&

	    !pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) {

		rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));

	    !dma_set_mask(&pdev->dev, DMA_BIT_MASK(64))) {

		rc = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64));

		if (rc) {

			rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));

			rc = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));

			if (rc) {

				dev_err(&pdev->dev,

					"64-bit DMA enable failed\n");
@@ -749,12 +749,12 @@ static int ahci_configure_dma_masks(struct pci_dev *pdev, int using_dac) 
			}

		}

	} else {

		rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));

		rc = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));

		if (rc) {

			dev_err(&pdev->dev, "32-bit DMA enable failed\n");

			return rc;

		}

		rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));

		rc = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));

		if (rc) {

			dev_err(&pdev->dev,

				"32-bit consistent DMA enable failed\n");

drivers/ata/libata-sff.c

+2 −2
Original line number Diff line number Diff line
@@ -3220,11 +3220,11 @@ void ata_pci_bmdma_init(struct ata_host *host) 
	 * ->sff_irq_clear method.  Try to initialize bmdma_addr

	 * regardless of dma masks.

	 */

	rc = pci_set_dma_mask(pdev, ATA_DMA_MASK);

	rc = dma_set_mask(&pdev->dev, ATA_DMA_MASK);

	if (rc)

		ata_bmdma_nodma(host, "failed to set dma mask");

	if (!rc) {

		rc = pci_set_consistent_dma_mask(pdev, ATA_DMA_MASK);

		rc = dma_set_coherent_mask(&pdev->dev, ATA_DMA_MASK);

		if (rc)

			ata_bmdma_nodma(host,

					"failed to set consistent dma mask");

drivers/ata/pata_atp867x.c

+2 −2
Original line number Diff line number Diff line
@@ -475,11 +475,11 @@ static int atp867x_ata_pci_sff_init_host(struct ata_host *host) 


	atp867x_fixup(host);



	rc = pci_set_dma_mask(pdev, ATA_DMA_MASK);

	rc = dma_set_mask(&pdev->dev, ATA_DMA_MASK);

	if (rc)

		return rc;



	rc = pci_set_consistent_dma_mask(pdev, ATA_DMA_MASK);

	rc = dma_set_coherent_mask(&pdev->dev, ATA_DMA_MASK);

	return rc;

}

drivers/ata/pata_cs5520.c

+2 −2
Original line number Diff line number Diff line
@@ -164,11 +164,11 @@ static int cs5520_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
		return -ENODEV;

	}



	if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) {

	if (dma_set_mask(&pdev->dev, DMA_BIT_MASK(32))) {

		printk(KERN_ERR DRV_NAME ": unable to configure DMA mask.\n");

		return -ENODEV;

	}

	if (pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32))) {

	if (dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32))) {

		printk(KERN_ERR DRV_NAME ": unable to configure consistent DMA mask.\n");

		return -ENODEV;

	}