ata: remove deprecated use of pci api
PATCH 1/1 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
)
)
--- drivers/ata/acard-ahci.c | 10 +++++----- drivers/ata/ahci.c | 10 +++++----- drivers/ata/libata-sff.c | 4 ++-- drivers/ata/pata_atp867x.c | 4 ++-- drivers/ata/pata_cs5520.c | 4 ++-- drivers/ata/pata_hpt3x3.c | 4 ++-- drivers/ata/pata_ninja32.c | 4 ++-- drivers/ata/pata_pdc2027x.c | 4 ++-- drivers/ata/pata_scc.c | 4 ++-- drivers/ata/pata_sil680.c | 4 ++-- drivers/ata/pdc_adma.c | 4 ++-- drivers/ata/sata_inic162x.c | 4 ++-- drivers/ata/sata_mv.c | 10 +++++----- drivers/ata/sata_nv.c | 12 ++++++------ drivers/ata/sata_promise.c | 4 ++-- drivers/ata/sata_qstor.c | 10 +++++----- drivers/ata/sata_sil.c | 4 ++-- drivers/ata/sata_sil24.c | 10 +++++----- drivers/ata/sata_svw.c | 4 ++-- drivers/ata/sata_sx4.c | 4 ++-- drivers/ata/sata_via.c | 4 ++-- drivers/ata/sata_vsc.c | 4 ++-- 22 files changed, 63 insertions(+), 63 deletions(-)
drivers/ata/acard-ahci.c +5 -5
@@ -181,10 +181,10 @@ static int acard_ahci_configure_dma_maskint 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_mask } } }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
@@ -738,10 +738,10 @@ static int ahci_configure_dma_masks(strureturn 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(stru } } }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
@@ -3220,11 +3220,11 @@ void ata_pci_bmdma_init(struct ata_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
@@ -475,11 +475,11 @@ static int atp867x_ata_pci_sff_init_hostatp867x_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
@@ -164,11 +164,11 @@ static int cs5520_init_one(struct pci_dereturn -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 ; }
drivers/ata/pata_hpt3x3.c +2 -2
@@ -221,10 +221,10 @@ static int hpt3x3_init_one(struct pci_deif (rc)return rc; host->iomap =pcim_iomap_table (pdev); - 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 );if (rc)return rc;
drivers/ata/pata_ninja32.c +2 -2
@@ -122,10 +122,10 @@ static int ninja32_init_one(struct pci_dreturn rc; host->iomap =pcim_iomap_table (dev); - rc =pci_set_dma_mask (dev,ATA_DMA_MASK ); + rc =dma_set_mask (&dev->dev,ATA_DMA_MASK );if (rc)return rc; - rc =pci_set_consistent_dma_mask (dev,ATA_DMA_MASK ); + rc =dma_set_coherent_mask (&dev->dev,ATA_DMA_MASK );if (rc)return rc;pci_set_master (dev);
drivers/ata/pata_pdc2027x.c +2 -2
@@ -730,11 +730,11 @@ static int pdc2027x_init_one(struct pci_return rc; host->iomap =pcim_iomap_table (pdev); - 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 );if (rc)return rc;
drivers/ata/pata_scc.c +2 -2
@@ -1029,10 +1029,10 @@ static int scc_host_init(struct ata_hostif (rc)return rc; - 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 );if (rc)return rc;
drivers/ata/pata_sil680.c +2 -2
@@ -374,10 +374,10 @@ static int sil680_init_one(struct pci_de host->iomap =pcim_iomap_table (pdev);/* Setup DMA masks */ - 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 );if (rc)return rc;pci_set_master (pdev);
drivers/ata/pdc_adma.c +2 -2
@@ -593,12 +593,12 @@ static int adma_set_dma_masks(struct pci {int rc; - 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" );return rc;
drivers/ata/sata_inic162x.c +2 -2
@@ -856,13 +856,13 @@ static int inic_init_one(struct pci_dev }/* Set dma_mask. This devices doesn't support 64bit addressing. */ - 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" );return rc;
drivers/ata/sata_mv.c +5 -5
@@ -4320,10 +4320,10 @@ static int pci_go_64(struct pci_dev *pde {int rc; -if (!pci_set_dma_mask (pdev,DMA_BIT_MASK (64 ))) { - rc =pci_set_consistent_dma_mask (pdev,DMA_BIT_MASK (64 )); +if (!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" );
@@ -4331,12 +4331,12 @@ static int pci_go_64(struct pci_dev *pde } } }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/sata_nv.c +6 -6
@@ -756,10 +756,10 @@ static int nv_adma_slave_config(struct sblk_queue_bounce_limit (sdev1->request_queue,ATA_DMA_MASK ); -pci_set_dma_mask (pdev,ATA_DMA_MASK ); +dma_set_mask (&pdev->dev,ATA_DMA_MASK ); }else {/** This shouldn't fail as it was set to this value before */ -pci_set_dma_mask (pdev, pp->adma_dma_mask); +dma_set_mask (&pdev->dev, pp->adma_dma_mask);if (sdev0)blk_queue_bounce_limit (sdev0->request_queue, pp->adma_dma_mask);
@@ -1133,10 +1133,10 @@ static int nv_adma_port_start(struct ata/* Ensure DMA mask is set to 32-bit before allocating legacy PRD and pad buffers */ - rc =pci_set_dma_mask (pdev,DMA_BIT_MASK (32 )); + rc =dma_set_mask (&pdev->dev,DMA_BIT_MASK (32 ));if (rc)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)return rc;
@@ -1161,8 +1161,8 @@ static int nv_adma_port_start(struct ataThese are allowed to fail since we store the value that ends up being used to set as the bounce limit in slave_config later if needed. */ -pci_set_dma_mask (pdev,DMA_BIT_MASK (64 )); -pci_set_consistent_dma_mask (pdev,DMA_BIT_MASK (64 )); +dma_set_mask (&pdev->dev,DMA_BIT_MASK (64 )); +dma_set_coherent_mask (&pdev->dev,DMA_BIT_MASK (64 )); pp->adma_dma_mask = *dev->dma_mask; mem = dmam_alloc_coherent(dev, NV_ADMA_PORT_PRIV_DMA_SZ,
drivers/ata/sata_promise.c +2 -2
@@ -1246,10 +1246,10 @@ static int pdc_ata_init_one(struct pci_d/* initialize adapter */ pdc_host_init (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 );if (rc)return rc;
drivers/ata/sata_qstor.c +5 -5
@@ -557,10 +557,10 @@ static int qs_set_dma_masks(struct pci_dint rc, have_64bit_bus = (bus_info &QS_HPHY_64BIT );if (have_64bit_bus && - !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" );
@@ -568,12 +568,12 @@ static int qs_set_dma_masks(struct pci_d } } }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/sata_sil.c +2 -2
@@ -770,10 +770,10 @@ static int sil_init_one(struct pci_dev *return rc; host->iomap =pcim_iomap_table (pdev); - 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 );if (rc)return rc;
drivers/ata/sata_sil24.c +5 -5
@@ -1312,10 +1312,10 @@ static int sil24_init_one(struct pci_dev host->iomap = iomap;/* configure and activate the device */ -if (!pci_set_dma_mask (pdev,DMA_BIT_MASK (64 ))) { - rc =pci_set_consistent_dma_mask (pdev,DMA_BIT_MASK (64 )); +if (!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" );
@@ -1323,12 +1323,12 @@ static int sil24_init_one(struct pci_dev } } }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/sata_svw.c +2 -2
@@ -487,10 +487,10 @@ static int k2_sata_init_one(struct pci_data_port_pbar_desc (ap,5 , offset,"port" ); } - 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 );if (rc)return rc;
drivers/ata/sata_sx4.c +2 -2
@@ -1476,10 +1476,10 @@ static int pdc_sata_init_one(struct pci_ }/* configure and activate */ - 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 );if (rc)return rc;
drivers/ata/sata_via.c +2 -2
@@ -502,10 +502,10 @@ static int vt6421_prepare_host(struct pcfor (i =0 ; i < host->n_ports; i++)vt6421_init_addrs (host->ports[i]); - 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 );if (rc)return rc;
drivers/ata/sata_vsc.c +2 -2
@@ -387,10 +387,10 @@ static int vsc_sata_init_one(struct pci_/* * Use 32 bit DMA mask, because 64 bit address support is poor. */ - rc =pci_set_dma_mask (pdev,DMA_BIT_MASK (32 )); + rc =dma_set_mask (&pdev->dev,DMA_BIT_MASK (32 ));if (rc)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)return rc;
Tejun Heo
AppliedQuoted 49 lines · Quentin Lambert
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
)
)
Quoted 1 line
Signed-off-by Quentin Lambert <[email protected]>
Applied to libata/for-4.1. Thanks.
Signature · 1 line
tejun