4 files changed, 6 insertions, 27 deletions

diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index dcd72445b0cd..0b7645b13df1 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -785,12 +785,8 @@ static ide_startstop_t ide_cd_do_request(ide_drive_t *drive, struct request *rq,
                 /* right now this can only be a reset... */
                 uptodate = 1;
                 goto out_end;
-        } else {
-                blk_dump_rq_flags(rq, DRV_NAME " bad flags");
-                if (rq->errors == 0)
-                        rq->errors = -EIO;
-                goto out_end;
-        }
+        } else
+                BUG();
 
         /* prepare sense request for this command */
         ide_prep_sense(drive, rq);
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c
index 6a1de2169709..695181120cdb 100644
--- a/drivers/ide/ide-disk.c
+++ b/drivers/ide/ide-disk.c
@@ -184,14 +184,7 @@ static ide_startstop_t ide_do_rw_disk(ide_drive_t *drive, struct request *rq,
         ide_hwif_t *hwif = drive->hwif;
 
         BUG_ON(drive->dev_flags & IDE_DFLAG_BLOCKED);
-
-        if (!blk_fs_request(rq)) {
-                blk_dump_rq_flags(rq, "ide_do_rw_disk - bad command");
-                if (rq->errors == 0)
-                        rq->errors = -EIO;
-                ide_complete_rq(drive, -EIO, ide_rq_bytes(rq));
-                return ide_stopped;
-        }
+        BUG_ON(!blk_fs_request(rq));
 
         ledtrig_ide_activity();
 
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index 800c83a9db83..8b3f204f7d73 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -269,10 +269,8 @@ static ide_startstop_t ide_floppy_do_request(ide_drive_t *drive,
         } else if (blk_pc_request(rq)) {
                 pc = &floppy->queued_pc;
                 idefloppy_blockpc_cmd(floppy, pc, rq);
-        } else {
-                blk_dump_rq_flags(rq, PFX "unsupported command in queue");
-                goto out_end;
-        }
+        } else
+                BUG();
 
         ide_prep_sense(drive, rq);
 
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
index 3a3f10f3f8fe..013dc595fab6 100644
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -586,15 +586,7 @@ static ide_startstop_t idetape_do_request(ide_drive_t *drive,
         debug_log(DBG_SENSE, "sector: %llu, nr_sectors: %u\n"
                   (unsigned long long)blk_rq_pos(rq), blk_rq_sectors(rq));
 
-        if (!(blk_special_request(rq) || blk_sense_request(rq))) {
-                /* We do not support buffer cache originated requests. */
-                printk(KERN_NOTICE "ide-tape: %s: Unsupported request in "
-                        "request queue (%d)\n", drive->name, rq->cmd_type);
-                if (blk_fs_request(rq) == 0 && rq->errors == 0)
-                        rq->errors = -EIO;
-                ide_complete_rq(drive, -EIO, ide_rq_bytes(rq));
-                return ide_stopped;
-        }
+        BUG_ON(!(blk_special_request(rq) || blk_sense_request(rq)));
 
         /* Retry a failed packet command */
         if (drive->failed_pc && drive->pc->c[0] == REQUEST_SENSE) {