scsi: hpsa and dc395x: Remove pci_dma_compat wrapper APIs.
PATCH 1/1 scsi: hpsa and dc395x: Remove pci_dma_compat wrapper APIs.
The legacy API wrappers in include/linux/pci-dma-compat.h should go away as it creates unnecessary midlayering for include/linux/dma-mapping.h APIs, instead use dma-mapping.h APIs directly.
The patch has been generated with the coccinelle script below and compile-tested.
@@@@
- PCI_DMA_BIDIRECTIONAL
+ DMA_BIDIRECTIONAL
@@@@
- PCI_DMA_TODEVICE
+ DMA_TO_DEVICE
@@@@
- PCI_DMA_FROMDEVICE
+ DMA_FROM_DEVICE
@@@@
- PCI_DMA_NONE
+ DMA_NONE
@@ expression E1, E2, E3; @@
- pci_alloc_consistent(E1, E2, E3)
+ dma_alloc_coherent(&E1->dev, E2, E3, GFP_)
@@ expression E1, E2, E3; @@
- pci_zalloc_consistent(E1, E2, E3)
+ dma_alloc_coherent(&E1->dev, E2, E3, GFP_)
@@ expression E1, E2, E3, E4; @@
- pci_free_consistent(E1, E2, E3, E4)
+ dma_free_coherent(&E1->dev, E2, E3, E4)
@@ expression E1, E2, E3, E4; @@
- pci_map_single(E1, E2, E3, E4)
+ dma_map_single(&E1->dev, E2, E3, E4)
@@ expression E1, E2, E3, E4; @@
- pci_unmap_single(E1, E2, E3, E4)
+ dma_unmap_single(&E1->dev, E2, E3, E4)
@@ expression E1, E2, E3, E4, E5; @@
- pci_map_page(E1, E2, E3, E4, E5)
+ dma_map_page(&E1->dev, E2, E3, E4, E5)
@@ expression E1, E2, E3, E4; @@
- pci_unmap_page(E1, E2, E3, E4)
+ dma_unmap_page(&E1->dev, E2, E3, E4)
@@ expression E1, E2, E3, E4; @@
- pci_map_sg(E1, E2, E3, E4)
+ dma_map_sg(&E1->dev, E2, E3, E4)
@@ expression E1, E2, E3, E4; @@
- pci_unmap_sg(E1, E2, E3, E4)
+ dma_unmap_sg(&E1->dev, E2, E3, E4)
@@ expression E1, E2, E3, E4; @@
- pci_dma_sync_single_for_cpu(E1, E2, E3, E4)
+ dma_sync_single_for_cpu(&E1->dev, E2, E3, E4)
@@ expression E1, E2, E3, E4; @@
- pci_dma_sync_single_for_device(E1, E2, E3, E4)
+ dma_sync_single_for_device(&E1->dev, E2, E3, E4)
@@ expression E1, E2, E3, E4; @@
- pci_dma_sync_sg_for_cpu(E1, E2, E3, E4)
+ dma_sync_sg_for_cpu(&E1->dev, E2, E3, E4)
@@ expression E1, E2, E3, E4; @@
- pci_dma_sync_sg_for_device(E1, E2, E3, E4)
+ dma_sync_sg_for_device(&E1->dev, E2, E3, E4)
@@ expression E1, E2; @@
- pci_dma_mapping_error(E1, E2)
+ dma_mapping_error(&E1->dev, E2)
@@ expression E1, E2; @@
- pci_set_consistent_dma_mask(E1, E2)
+ dma_set_coherent_mask(&E1->dev, E2)
@@ expression E1, E2; @@
- pci_set_dma_mask(E1, E2)
+ dma_set_mask(&E1->dev, E2)
--- drivers/scsi/dc395x.c | 6 +++--- drivers/scsi/hpsa.c | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-)
drivers/scsi/dc395x.c +3 -3
@@ -902,7 +902,7 @@ static void build_srb(struct scsi_cmnd *cmd, struct DeviceCtlBlk *dcb, nseg =scsi_dma_map (cmd);BUG_ON (nseg <0 ); -if (dir ==PCI_DMA_NONE || !nseg) { +if (dir ==DMA_NONE || !nseg) { dprintkdbg(DBG_0, "build_srb: [0] len=%d buf=%p use_sg=%d !MAP=%08x\n", cmd->bufflen, scsi_sglist(cmd), scsi_sg_count(cmd),
@@ -3135,7 +3135,7 @@ static void pci_unmap_srb(struct AdapterCtlBlk *acb, struct ScsiReqBlk *srb)struct scsi_cmnd *cmd = srb->cmd;enum dma_data_direction dir = cmd->sc_data_direction; -if (scsi_sg_count (cmd) && dir !=PCI_DMA_NONE ) { +if (scsi_sg_count (cmd) && dir !=DMA_NONE ) {/* unmap DC395x SG list */ dprintkdbg (DBG_SG ,"pci_unmap_srb: list=%08x(%05x)\n" , srb->sg_bus_addr,SEGMENTX_LEN );
@@ -3333,7 +3333,7 @@ static void srb_done(struct AdapterCtlBlk *acb, struct DeviceCtlBlk *dcb,if (!ckc_only && (cmd->result &RES_DID ) ==0 && cmd->cmnd[2 ] ==0 &&scsi_bufflen (cmd) >=8 - && dir !=PCI_DMA_NONE && ptr && (ptr->Vers &0x07 ) >=2 ) + && dir !=DMA_NONE && ptr && (ptr->Vers &0x07 ) >=2 ) dcb->inquiry7 = ptr->Flags;/*if( srb->cmd->cmnd[0] == INQUIRY && */
drivers/scsi/hpsa.c +8 -8
@@ -9310,10 +9310,10 @@ static int hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)static void hpsa_free_ioaccel1_cmd_and_bft (struct ctlr_info *h) {if (h->ioaccel_cmd_pool) { -pci_free_consistent (h->pdev, - h->nr_cmds *sizeof (*h->ioaccel_cmd_pool), - h->ioaccel_cmd_pool, - h->ioaccel_cmd_pool_dhandle); +dma_free_coherent (&h->pdev->dev, + h->nr_cmds *sizeof (*h->ioaccel_cmd_pool), + h->ioaccel_cmd_pool, + h->ioaccel_cmd_pool_dhandle); h->ioaccel_cmd_pool =NULL ; h->ioaccel_cmd_pool_dhandle =0 ; }
@@ -9363,10 +9363,10 @@ static void hpsa_free_ioaccel2_cmd_and_bft(struct ctlr_info *h)hpsa_free_ioaccel2_sg_chain_blocks (h);if (h->ioaccel2_cmd_pool) { -pci_free_consistent (h->pdev, - h->nr_cmds *sizeof (*h->ioaccel2_cmd_pool), - h->ioaccel2_cmd_pool, - h->ioaccel2_cmd_pool_dhandle); +dma_free_coherent (&h->pdev->dev, + h->nr_cmds *sizeof (*h->ioaccel2_cmd_pool), + h->ioaccel2_cmd_pool, + h->ioaccel2_cmd_pool_dhandle); h->ioaccel2_cmd_pool =NULL ; h->ioaccel2_cmd_pool_dhandle =0 ; }
Signature · 1 line
2.17.1