11 files changed, 14 insertions, 20 deletions

diff --git a/drivers/acorn/block/fd1772.c b/drivers/acorn/block/fd1772.c
index 674bf81c6e66..423ed08fb6f7 100644
--- a/drivers/acorn/block/fd1772.c
+++ b/drivers/acorn/block/fd1772.c
@@ -1246,7 +1246,7 @@ repeat:
         del_timer(&motor_off_timer);
 
         ReqCnt = 0;
-        ReqCmd = CURRENT->cmd;
+        ReqCmd = rq_data_dir(CURRENT);
         ReqBlock = CURRENT->sector;
         ReqBuffer = CURRENT->buffer;
         setup_req_params(drive);
diff --git a/drivers/acorn/block/mfmhd.c b/drivers/acorn/block/mfmhd.c
index 689a4c3542ba..d85520f78e68 100644
--- a/drivers/acorn/block/mfmhd.c
+++ b/drivers/acorn/block/mfmhd.c
@@ -439,7 +439,7 @@ static void mfm_rw_intr(void)
            a choice of command end or some data which is ready to be collected */
         /* I think we have to transfer data while the interrupt line is on and its
            not any other type of interrupt */
-        if (CURRENT->cmd == WRITE) {
+        if (rq_data_dir(CURRENT) == WRITE) {
                 extern void hdc63463_writedma(void);
                 if ((hdc63463_dataleft <= 0) && (!(mfm_status & STAT_CED))) {
                         printk("mfm_rw_intr: Apparent DMA write request when no more to DMA\n");
@@ -799,7 +799,7 @@ static void issue_request(unsigned int block, unsigned int nsect,
         raw_cmd.head = start_head;
         raw_cmd.cylinder = track / p->heads;
         raw_cmd.cmdtype = CURRENT->cmd;
-        raw_cmd.cmdcode = CURRENT->cmd == WRITE ? CMD_WD : CMD_RD;
+        raw_cmd.cmdcode = rq_data_dir(CURRENT) == WRITE ? CMD_WD : CMD_RD;
         raw_cmd.cmddata[0] = dev + 1;   /* DAG: +1 to get US */
         raw_cmd.cmddata[1] = raw_cmd.head;
         raw_cmd.cmddata[2] = raw_cmd.cylinder >> 8;
@@ -830,7 +830,7 @@ static void issue_request(unsigned int block, unsigned int nsect,
         hdc63463_dataleft = nsect * 256;        /* Better way? */
 
         DBG("mfm%c: %sing: CHS=%d/%d/%d, sectors=%d, buffer=0x%08lx (%p)\n",
-             raw_cmd.dev + 'a', (CURRENT->cmd == READ) ? "read" : "writ",
+             raw_cmd.dev + 'a', rq_data_dir(CURRENT) == READ ? "read" : "writ",
                        raw_cmd.cylinder,
                        raw_cmd.head,
             raw_cmd.sector, nsect, (unsigned long) Copy_buffer, CURRENT);
@@ -917,13 +917,6 @@ static void mfm_request(void)
 
                 DBG("mfm_request: block after offset=%d\n", block);
 
-                if (CURRENT->cmd != READ && CURRENT->cmd != WRITE) {
-                        printk("unknown mfm-command %d\n", CURRENT->cmd);
-                        end_request(CURRENT, 0);
-                        Busy = 0;
-                        printk("mfm: continue 4\n");
-                        continue;
-                }
                 issue_request(block, nsect, CURRENT);
 
                 break;
diff --git a/drivers/block/amiflop.c b/drivers/block/amiflop.c
index 27a139025ced..6ce8b897e262 100644
--- a/drivers/block/amiflop.c
+++ b/drivers/block/amiflop.c
@@ -1363,7 +1363,7 @@ static void redo_fd_request(void)
 #ifdef DEBUG
                 printk("fd: sector %ld + %d requested for %s\n",
                        CURRENT->sector,cnt,
-                       (CURRENT->cmd==READ)?"read":"write");
+                       (rq_data_dir(CURRENT) == READ) ? "read" : "write");
 #endif
                 block = CURRENT->sector + cnt;
                 if ((int)block > floppy->blocks) {
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 069ae39a9cd9..c575fb1d585f 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -416,7 +416,7 @@ static void nbd_clear_que(struct nbd_device *lo)
 /*
  * We always wait for result of write, for now. It would be nice to make it optional
  * in future
- * if ((req->cmd == WRITE) && (lo->flags & NBD_WRITE_NOCHK)) 
+ * if ((rq_data_dir(req) == WRITE) && (lo->flags & NBD_WRITE_NOCHK))
  *   { printk( "Warning: Ignoring result!\n"); nbd_end_request( req ); }
  */
 
diff --git a/drivers/cdrom/aztcd.c b/drivers/cdrom/aztcd.c
index 1f9fb7a96703..d7fbfaae2449 100644
--- a/drivers/cdrom/aztcd.c
+++ b/drivers/cdrom/aztcd.c
@@ -229,7 +229,7 @@ static struct request_queue *azt_queue;
 static int current_valid(void)
 {
         return CURRENT &&
-                CURRENT->cmd == READ &&
+                rq_data_dir(CURRENT) == READ &&
                 CURRENT->sector != -1;
 }
 
diff --git a/drivers/cdrom/cm206.c b/drivers/cdrom/cm206.c
index 230131163240..2f8fe3b6bbd0 100644
--- a/drivers/cdrom/cm206.c
+++ b/drivers/cdrom/cm206.c
@@ -851,7 +851,7 @@ static void do_cm206_request(request_queue_t * q)
                 if (!req)
                         return;
 
-                if (req->cmd != READ) {
+                if (rq_data_dir(req) != READ) {
                         debug(("Non-read command %d on cdrom\n", req->cmd));
                         end_request(req, 0);
                         continue;
diff --git a/drivers/cdrom/gscd.c b/drivers/cdrom/gscd.c
index b3ab6e9b8df1..176742ed007b 100644
--- a/drivers/cdrom/gscd.c
+++ b/drivers/cdrom/gscd.c
@@ -264,7 +264,7 @@ repeat:
         if (req->sector == -1)
                 goto out;
 
-        if (req->cmd != READ) {
+        if (rq_data_dir(req) != READ) {
                 printk("GSCD: bad cmd %u\n", rq_data_dir(req));
                 end_request(req, 0);
                 goto repeat;
diff --git a/drivers/cdrom/mcdx.c b/drivers/cdrom/mcdx.c
index 4310cc84dfed..972ee9c8247c 100644
--- a/drivers/cdrom/mcdx.c
+++ b/drivers/cdrom/mcdx.c
@@ -596,7 +596,7 @@ static void do_mcdx_request(request_queue_t * q)
         xtrace(REQUEST, "do_request() (%lu + %lu)\n",
                req->sector, req->nr_sectors);
 
-        if (req->cmd != READ) {
+        if (rq_data_dir(req) != READ) {
                 xwarn("do_request(): non-read command to cd!!\n");
                 xtrace(REQUEST, "end_request(0): write\n");
                 end_request(req, 0);
diff --git a/drivers/cdrom/optcd.c b/drivers/cdrom/optcd.c
index 3541690a77d4..efd619c0fe10 100644
--- a/drivers/cdrom/optcd.c
+++ b/drivers/cdrom/optcd.c
@@ -977,7 +977,7 @@ static int update_toc(void)
 static int current_valid(void)
 {
         return CURRENT &&
-                CURRENT->cmd == READ &&
+                rq_data_dir(CURRENT) == READ &&
                 CURRENT->sector != -1;
 }
 
diff --git a/drivers/cdrom/sjcd.c b/drivers/cdrom/sjcd.c
index 5409fca5bbfc..76c24e679e68 100644
--- a/drivers/cdrom/sjcd.c
+++ b/drivers/cdrom/sjcd.c
@@ -1064,7 +1064,7 @@ static void sjcd_invalidate_buffers(void)
 static int current_valid(void)
 {
         return CURRENT &&
-                CURRENT->cmd == READ &&
+                rq_data_dir(CURRENT) == READ &&
                 CURRENT->sector != -1;
 }
 
diff --git a/drivers/ide/legacy/hd.c b/drivers/ide/legacy/hd.c
index 661c12f6dda6..7f4c0a5050a1 100644
--- a/drivers/ide/legacy/hd.c
+++ b/drivers/ide/legacy/hd.c
@@ -623,7 +623,8 @@ repeat:
         cyl   = track / disk->head;
 #ifdef DEBUG
         printk("%s: %sing: CHS=%d/%d/%d, sectors=%d, buffer=%p\n",
-                req->rq_disk->disk_name, (req->cmd == READ)?"read":"writ",
+                req->rq_disk->disk_name,
+                req_data_dir(req) == READ ? "read" : "writ",
                 cyl, head, sec, nsect, req->buffer);
 #endif
         if (blk_fs_request(req)) {