summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/sg.c
diff options
context:
space:
mode:
author <hch@lst.de>2005-04-17 15:26:13 -0500
committerJames Bottomley <jejb@titanic>2005-04-18 13:49:58 -0500
commitbe7db055dd7261522557046370f49160728e3847 (patch)
tree314689dfb551ee9ad5ef8c27576762489a51897d /drivers/scsi/sg.c
parent80e2ca3dcb1043420ac4b06de8eed3d6fedaddda (diff)
downloadop-kernel-dev-be7db055dd7261522557046370f49160728e3847.zip
op-kernel-dev-be7db055dd7261522557046370f49160728e3847.tar.gz
[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 <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/sg.c')
-rw-r--r--drivers/scsi/sg.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index ce83322..7936aaf 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -747,16 +747,16 @@ sg_common_write(Sg_fd * sfp, Sg_request * srp,
switch (hp->dxfer_direction) {
case SG_DXFER_TO_FROM_DEV:
case SG_DXFER_FROM_DEV:
- SRpnt->sr_data_direction = SCSI_DATA_READ;
+ SRpnt->sr_data_direction = DMA_FROM_DEVICE;
break;
case SG_DXFER_TO_DEV:
- SRpnt->sr_data_direction = SCSI_DATA_WRITE;
+ SRpnt->sr_data_direction = DMA_TO_DEVICE;
break;
case SG_DXFER_UNKNOWN:
- SRpnt->sr_data_direction = SCSI_DATA_UNKNOWN;
+ SRpnt->sr_data_direction = DMA_BIDIRECTIONAL;
break;
default:
- SRpnt->sr_data_direction = SCSI_DATA_NONE;
+ SRpnt->sr_data_direction = DMA_NONE;
break;
}
SRpnt->upper_private_data = srp;
OpenPOWER on IntegriCloud