From be7db055dd7261522557046370f49160728e3847 Mon Sep 17 00:00:00 2001 From: Date: Sun, 17 Apr 2005 15:26:13 -0500 Subject: [PATCH] remove old scsi data direction macros these have been wrappers for the generic dma direction bits since 2.5.x. This patch converts the few remaining drivers and removes the macros. Arjan noticed there's some hunk in here that shouldn't. Updated patch below: Signed-off-by: James Bottomley --- drivers/scsi/aic7xxx/aic79xx_osm.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'drivers/scsi/aic7xxx/aic79xx_osm.c') diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c index fb2877c303f0..550c9921691a 100644 --- a/drivers/scsi/aic7xxx/aic79xx_osm.c +++ b/drivers/scsi/aic7xxx/aic79xx_osm.c @@ -687,7 +687,7 @@ ahd_linux_unmap_scb(struct ahd_softc *ahd, struct scb *scb) int direction; cmd = scb->io_ctx; - direction = scsi_to_pci_dma_dir(cmd->sc_data_direction); + direction = cmd->sc_data_direction; ahd_sync_sglist(ahd, scb, BUS_DMASYNC_POSTWRITE); if (cmd->use_sg != 0) { struct scatterlist *sg; @@ -3338,7 +3338,7 @@ ahd_linux_dv_inq(struct ahd_softc *ahd, struct scsi_cmnd *cmd, } ahd_linux_dv_fill_cmd(ahd, cmd, devinfo); - cmd->sc_data_direction = SCSI_DATA_READ; + cmd->sc_data_direction = DMA_FROM_DEVICE; cmd->cmd_len = 6; cmd->cmnd[0] = INQUIRY; cmd->cmnd[4] = request_length; @@ -3363,7 +3363,7 @@ ahd_linux_dv_tur(struct ahd_softc *ahd, struct scsi_cmnd *cmd, #endif /* Do a TUR to clear out any non-fatal transitional state */ ahd_linux_dv_fill_cmd(ahd, cmd, devinfo); - cmd->sc_data_direction = SCSI_DATA_NONE; + cmd->sc_data_direction = DMA_NONE; cmd->cmd_len = 6; cmd->cmnd[0] = TEST_UNIT_READY; } @@ -3385,7 +3385,7 @@ ahd_linux_dv_rebd(struct ahd_softc *ahd, struct scsi_cmnd *cmd, free(targ->dv_buffer, M_DEVBUF); targ->dv_buffer = malloc(AHD_REBD_LEN, M_DEVBUF, M_WAITOK); ahd_linux_dv_fill_cmd(ahd, cmd, devinfo); - cmd->sc_data_direction = SCSI_DATA_READ; + cmd->sc_data_direction = DMA_FROM_DEVICE; cmd->cmd_len = 10; cmd->cmnd[0] = READ_BUFFER; cmd->cmnd[1] = 0x0b; @@ -3407,7 +3407,7 @@ ahd_linux_dv_web(struct ahd_softc *ahd, struct scsi_cmnd *cmd, } #endif ahd_linux_dv_fill_cmd(ahd, cmd, devinfo); - cmd->sc_data_direction = SCSI_DATA_WRITE; + cmd->sc_data_direction = DMA_TO_DEVICE; cmd->cmd_len = 10; cmd->cmnd[0] = WRITE_BUFFER; cmd->cmnd[1] = 0x0a; @@ -3429,7 +3429,7 @@ ahd_linux_dv_reb(struct ahd_softc *ahd, struct scsi_cmnd *cmd, } #endif ahd_linux_dv_fill_cmd(ahd, cmd, devinfo); - cmd->sc_data_direction = SCSI_DATA_READ; + cmd->sc_data_direction = DMA_FROM_DEVICE; cmd->cmd_len = 10; cmd->cmnd[0] = READ_BUFFER; cmd->cmnd[1] = 0x0a; @@ -3455,7 +3455,7 @@ ahd_linux_dv_su(struct ahd_softc *ahd, struct scsi_cmnd *cmd, } #endif ahd_linux_dv_fill_cmd(ahd, cmd, devinfo); - cmd->sc_data_direction = SCSI_DATA_NONE; + cmd->sc_data_direction = DMA_NONE; cmd->cmd_len = 6; cmd->cmnd[0] = START_STOP_UNIT; cmd->cmnd[4] = le | SSS_START; @@ -4018,7 +4018,7 @@ ahd_linux_run_device_queue(struct ahd_softc *ahd, struct ahd_linux_device *dev) int dir; cur_seg = (struct scatterlist *)cmd->request_buffer; - dir = scsi_to_pci_dma_dir(cmd->sc_data_direction); + dir = cmd->sc_data_direction; nseg = pci_map_sg(ahd->dev_softc, cur_seg, cmd->use_sg, dir); scb->platform_data->xfer_len = 0; @@ -4038,7 +4038,7 @@ ahd_linux_run_device_queue(struct ahd_softc *ahd, struct ahd_linux_device *dev) int dir; sg = scb->sg_list; - dir = scsi_to_pci_dma_dir(cmd->sc_data_direction); + dir = cmd->sc_data_direction; addr = pci_map_single(ahd->dev_softc, cmd->request_buffer, cmd->request_bufflen, dir); -- cgit v1.2.3