aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/sg.c
diff options
context:
space:
mode:
author <hch@lst.de>2005-04-17 16:26:13 -0400
committerJames Bottomley <jejb@titanic>2005-04-18 14:49:58 -0400
commitbe7db055dd7261522557046370f49160728e3847 (patch)
tree314689dfb551ee9ad5ef8c27576762489a51897d /drivers/scsi/sg.c
parent80e2ca3dcb1043420ac4b06de8eed3d6fedaddda (diff)
[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 ce8332297dfa..7936aafc3d05 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -747,16 +747,16 @@ sg_common_write(Sg_fd * sfp, Sg_request * srp,
747 switch (hp->dxfer_direction) { 747 switch (hp->dxfer_direction) {
748 case SG_DXFER_TO_FROM_DEV: 748 case SG_DXFER_TO_FROM_DEV:
749 case SG_DXFER_FROM_DEV: 749 case SG_DXFER_FROM_DEV:
750 SRpnt->sr_data_direction = SCSI_DATA_READ; 750 SRpnt->sr_data_direction = DMA_FROM_DEVICE;
751 break; 751 break;
752 case SG_DXFER_TO_DEV: 752 case SG_DXFER_TO_DEV:
753 SRpnt->sr_data_direction = SCSI_DATA_WRITE; 753 SRpnt->sr_data_direction = DMA_TO_DEVICE;
754 break; 754 break;
755 case SG_DXFER_UNKNOWN: 755 case SG_DXFER_UNKNOWN:
756 SRpnt->sr_data_direction = SCSI_DATA_UNKNOWN; 756 SRpnt->sr_data_direction = DMA_BIDIRECTIONAL;
757 break; 757 break;
758 default: 758 default:
759 SRpnt->sr_data_direction = SCSI_DATA_NONE; 759 SRpnt->sr_data_direction = DMA_NONE;
760 break; 760 break;
761 } 761 }
762 SRpnt->upper_private_data = srp; 762 SRpnt->upper_private_data = srp;