ide: improve failed opcode reporting

PATCH New Bartlomiej Zolnierkiewicz 1 participant 1 message May 19, 2009 libata

Share & tools

Bartlomiej Zolnierkiewicz

author

2009-05-19 21:14 UTC #0 lore raw

PATCH 1/1 ide: improve failed opcode reporting

Nowadays we (almost) always store the currently executing command in hwif->cmd so we can use it for the failed opcode reporting.

Cc Martin Lottermoser <[email protected]>

Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>

---
 drivers/ide/ide-lib.c |   23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

drivers/ide/ide-lib.c +4 ~~-19~~

Index: b/drivers/ide/ide-lib.c
===================================================================
@@ -31,24 +31,6 @@ void ide_toggle_bounce(ide_drive_t *driv
 		blk_queue_bounce_limit(drive->queue, addr);
 }
 
-static void ide_dump_opcode(ide_drive_t *drive)
-{
-	struct request *rq = drive->hwif->rq;
-	struct ide_cmd *cmd = NULL;
-
-	if (!rq)
-		return;
-
-	if (rq->cmd_type == REQ_TYPE_ATA_TASKFILE)
-		cmd = rq->special;
-
-	printk(KERN_ERR "ide: failed opcode was: ");
-	if (cmd == NULL)
-		printk(KERN_CONT "unknown\n");
-	else
-		printk(KERN_CONT "0x%02x\n", cmd->tf.command);
-}
-
 u64 ide_get_lba_addr(struct ide_cmd *cmd, int lba48)
 {
 	struct ide_taskfile *tf = &cmd->tf;

@@ -179,7 +161,10 @@ u8 ide_dump_status(ide_drive_t *drive, c
 		else
 			ide_dump_atapi_error(drive, err);
 	}
-	ide_dump_opcode(drive);
+
+	printk(KERN_ERR "%s: possibly failed opcode: 0x%02x\n",
+		drive->name, drive->hwif->cmd.tf.command);
+
 	return err;
 }
 EXPORT_SYMBOL(ide_dump_status);