diff --git a/scst/src/dev_handlers/scst_cdrom.c b/scst/src/dev_handlers/scst_cdrom.c
index 18bd4f1bb..04c683c3d 100644
--- a/scst/src/dev_handlers/scst_cdrom.c
+++ b/scst/src/dev_handlers/scst_cdrom.c
@@ -65,7 +65,6 @@ static int cdrom_attach(struct scst_device *dev)
 	uint8_t *buffer = NULL;
 	int retries;
 	unsigned char sense_buffer[SCSI_SENSE_BUFFERSIZE];
-	enum dma_data_direction data_dir;
 
 	TRACE_ENTRY();
 
@@ -93,11 +92,10 @@ static int cdrom_attach(struct scst_device *dev)
 	while (1) {
 		memset(buffer, 0, buffer_size);
 		memset(sense_buffer, 0, sizeof(sense_buffer));
-		data_dir = SCST_DATA_READ;
 
 		TRACE_DBG("%s", "Doing READ_CAPACITY");
-		rc = scst_scsi_execute(dev->scsi_dev, cmd, data_dir, buffer,
-				       buffer_size, sense_buffer,
+		rc = scst_scsi_execute(dev->scsi_dev, cmd, DMA_FROM_DEVICE,
+				       buffer, buffer_size, sense_buffer,
 				       SCST_GENERIC_CDROM_REG_TIMEOUT, 3, 0);
 
 		TRACE_DBG("READ_CAPACITY done: %x", rc);
diff --git a/scst/src/dev_handlers/scst_disk.c b/scst/src/dev_handlers/scst_disk.c
index 785d4bcf7..fd01b8d1c 100644
--- a/scst/src/dev_handlers/scst_disk.c
+++ b/scst/src/dev_handlers/scst_disk.c
@@ -50,7 +50,6 @@ static int disk_attach(struct scst_device *dev)
 	uint8_t *buffer = NULL;
 	int retries;
 	unsigned char sense_buffer[SCSI_SENSE_BUFFERSIZE];
-	enum dma_data_direction data_dir;
 
 	TRACE_ENTRY();
 
@@ -78,11 +77,10 @@ static int disk_attach(struct scst_device *dev)
 	while (1) {
 		memset(buffer, 0, buffer_size);
 		memset(sense_buffer, 0, sizeof(sense_buffer));
-		data_dir = SCST_DATA_READ;
 
 		TRACE_DBG("%s", "Doing READ_CAPACITY");
-		rc = scst_scsi_execute(dev->scsi_dev, cmd, data_dir, buffer,
-				       buffer_size, sense_buffer,
+		rc = scst_scsi_execute(dev->scsi_dev, cmd, DMA_FROM_DEVICE,
+				       buffer, buffer_size, sense_buffer,
 				       SCST_GENERIC_DISK_REG_TIMEOUT, 3, 0);
 
 		TRACE_DBG("READ_CAPACITY done: %x", rc);
diff --git a/scst/src/dev_handlers/scst_modisk.c b/scst/src/dev_handlers/scst_modisk.c
index d892973ae..65699963b 100644
--- a/scst/src/dev_handlers/scst_modisk.c
+++ b/scst/src/dev_handlers/scst_modisk.c
@@ -130,7 +130,6 @@ static int modisk_attach(struct scst_device *dev)
 	uint8_t *buffer = NULL;
 	int retries;
 	unsigned char sense_buffer[SCSI_SENSE_BUFFERSIZE];
-	enum dma_data_direction data_dir;
 
 	TRACE_ENTRY();
 
@@ -174,11 +173,10 @@ static int modisk_attach(struct scst_device *dev)
 	while (1) {
 		memset(buffer, 0, buffer_size);
 		memset(sense_buffer, 0, sizeof(sense_buffer));
-		data_dir = SCST_DATA_READ;
 
 		TRACE_DBG("%s", "Doing READ_CAPACITY");
-		rc = scst_scsi_execute(dev->scsi_dev, cmd, data_dir, buffer,
-				       buffer_size, sense_buffer,
+		rc = scst_scsi_execute(dev->scsi_dev, cmd, DMA_FROM_DEVICE,
+				       buffer, buffer_size, sense_buffer,
 				       SCST_GENERIC_MODISK_REG_TIMEOUT, 3, 0);
 
 		TRACE_DBG("READ_CAPACITY done: %x", rc);