diff options
Diffstat (limited to 'drivers/scsi/ips.c')
-rw-r--r-- | drivers/scsi/ips.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c index 47c263e5cd39..fbc2cb6667a1 100644 --- a/drivers/scsi/ips.c +++ b/drivers/scsi/ips.c | |||
@@ -231,9 +231,9 @@ module_param(ips, charp, 0); | |||
231 | #endif | 231 | #endif |
232 | 232 | ||
233 | #define IPS_DMA_DIR(scb) ((!scb->scsi_cmd || ips_is_passthru(scb->scsi_cmd) || \ | 233 | #define IPS_DMA_DIR(scb) ((!scb->scsi_cmd || ips_is_passthru(scb->scsi_cmd) || \ |
234 | SCSI_DATA_NONE == scb->scsi_cmd->sc_data_direction) ? \ | 234 | DMA_NONE == scb->scsi_cmd->sc_data_direction) ? \ |
235 | PCI_DMA_BIDIRECTIONAL : \ | 235 | PCI_DMA_BIDIRECTIONAL : \ |
236 | scsi_to_pci_dma_dir(scb->scsi_cmd->sc_data_direction)) | 236 | scb->scsi_cmd->sc_data_direction) |
237 | 237 | ||
238 | #ifdef IPS_DEBUG | 238 | #ifdef IPS_DEBUG |
239 | #define METHOD_TRACE(s, i) if (ips_debug >= (i+10)) printk(KERN_NOTICE s "\n"); | 239 | #define METHOD_TRACE(s, i) if (ips_debug >= (i+10)) printk(KERN_NOTICE s "\n"); |
@@ -2849,8 +2849,7 @@ ips_next(ips_ha_t * ha, int intr) | |||
2849 | 2849 | ||
2850 | sg = SC->request_buffer; | 2850 | sg = SC->request_buffer; |
2851 | scb->sg_count = pci_map_sg(ha->pcidev, sg, SC->use_sg, | 2851 | scb->sg_count = pci_map_sg(ha->pcidev, sg, SC->use_sg, |
2852 | scsi_to_pci_dma_dir(SC-> | 2852 | SC->sc_data_direction); |
2853 | sc_data_direction)); | ||
2854 | scb->flags |= IPS_SCB_MAP_SG; | 2853 | scb->flags |= IPS_SCB_MAP_SG; |
2855 | for (i = 0; i < scb->sg_count; i++) { | 2854 | for (i = 0; i < scb->sg_count; i++) { |
2856 | if (ips_fill_scb_sg_single | 2855 | if (ips_fill_scb_sg_single |
@@ -2865,8 +2864,7 @@ ips_next(ips_ha_t * ha, int intr) | |||
2865 | pci_map_single(ha->pcidev, | 2864 | pci_map_single(ha->pcidev, |
2866 | SC->request_buffer, | 2865 | SC->request_buffer, |
2867 | SC->request_bufflen, | 2866 | SC->request_bufflen, |
2868 | scsi_to_pci_dma_dir(SC-> | 2867 | SC->sc_data_direction); |
2869 | sc_data_direction)); | ||
2870 | scb->flags |= IPS_SCB_MAP_SINGLE; | 2868 | scb->flags |= IPS_SCB_MAP_SINGLE; |
2871 | ips_fill_scb_sg_single(ha, scb->data_busaddr, | 2869 | ips_fill_scb_sg_single(ha, scb->data_busaddr, |
2872 | scb, 0, | 2870 | scb, 0, |