struct request *rq = drive->hwif->rq;
        unsigned long wait = 0;
 
-       debug_log("%s: rq->cmd[0]: 0x%x\n", __func__, rq->cmd[0]);
+       debug_log("%s: scsi_req(rq)->cmd[0]: 0x%x\n", __func__, scsi_req(rq)->cmd[0]);
 
        /*
         * Some commands are *slow* and normally take a long time to complete.
                                return ide_do_reset(drive);
                        }
 
-                       debug_log("[cmd %x]: check condition\n", rq->cmd[0]);
+                       debug_log("[cmd %x]: check condition\n", scsi_req(rq)->cmd[0]);
 
                        /* Retry operation */
                        ide_retry_pc(drive);
                ide_pad_transfer(drive, write, bcount);
 
        debug_log("[cmd %x] transferred %d bytes, padded %d bytes, resid: %u\n",
-                 rq->cmd[0], done, bcount, scsi_req(rq)->resid_len);
+                 scsi_req(rq)->cmd[0], done, bcount, scsi_req(rq)->resid_len);
 
        /* And set the interrupt handler again */
        ide_set_handler(drive, ide_pc_intr, timeout);