diff options
Diffstat (limited to 'drivers/scsi/megaraid.c')
-rw-r--r-- | drivers/scsi/megaraid.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c index f2684dd09ed0..5c1776406c96 100644 --- a/drivers/scsi/megaraid.c +++ b/drivers/scsi/megaraid.c | |||
@@ -1469,8 +1469,8 @@ mega_cmd_done(adapter_t *adapter, u8 completed[], int nstatus, int status) | |||
1469 | if( scb->state & SCB_ABORT ) { | 1469 | if( scb->state & SCB_ABORT ) { |
1470 | 1470 | ||
1471 | printk(KERN_WARNING | 1471 | printk(KERN_WARNING |
1472 | "megaraid: aborted cmd %lx[%x] complete.\n", | 1472 | "megaraid: aborted cmd [%x] complete.\n", |
1473 | scb->cmd->serial_number, scb->idx); | 1473 | scb->idx); |
1474 | 1474 | ||
1475 | scb->cmd->result = (DID_ABORT << 16); | 1475 | scb->cmd->result = (DID_ABORT << 16); |
1476 | 1476 | ||
@@ -1488,8 +1488,8 @@ mega_cmd_done(adapter_t *adapter, u8 completed[], int nstatus, int status) | |||
1488 | if( scb->state & SCB_RESET ) { | 1488 | if( scb->state & SCB_RESET ) { |
1489 | 1489 | ||
1490 | printk(KERN_WARNING | 1490 | printk(KERN_WARNING |
1491 | "megaraid: reset cmd %lx[%x] complete.\n", | 1491 | "megaraid: reset cmd [%x] complete.\n", |
1492 | scb->cmd->serial_number, scb->idx); | 1492 | scb->idx); |
1493 | 1493 | ||
1494 | scb->cmd->result = (DID_RESET << 16); | 1494 | scb->cmd->result = (DID_RESET << 16); |
1495 | 1495 | ||
@@ -1958,8 +1958,8 @@ megaraid_abort_and_reset(adapter_t *adapter, Scsi_Cmnd *cmd, int aor) | |||
1958 | struct list_head *pos, *next; | 1958 | struct list_head *pos, *next; |
1959 | scb_t *scb; | 1959 | scb_t *scb; |
1960 | 1960 | ||
1961 | printk(KERN_WARNING "megaraid: %s-%lx cmd=%x <c=%d t=%d l=%d>\n", | 1961 | printk(KERN_WARNING "megaraid: %s cmd=%x <c=%d t=%d l=%d>\n", |
1962 | (aor == SCB_ABORT)? "ABORTING":"RESET", cmd->serial_number, | 1962 | (aor == SCB_ABORT)? "ABORTING":"RESET", |
1963 | cmd->cmnd[0], cmd->device->channel, | 1963 | cmd->cmnd[0], cmd->device->channel, |
1964 | cmd->device->id, cmd->device->lun); | 1964 | cmd->device->id, cmd->device->lun); |
1965 | 1965 | ||
@@ -1983,9 +1983,9 @@ megaraid_abort_and_reset(adapter_t *adapter, Scsi_Cmnd *cmd, int aor) | |||
1983 | if( scb->state & SCB_ISSUED ) { | 1983 | if( scb->state & SCB_ISSUED ) { |
1984 | 1984 | ||
1985 | printk(KERN_WARNING | 1985 | printk(KERN_WARNING |
1986 | "megaraid: %s-%lx[%x], fw owner.\n", | 1986 | "megaraid: %s[%x], fw owner.\n", |
1987 | (aor==SCB_ABORT) ? "ABORTING":"RESET", | 1987 | (aor==SCB_ABORT) ? "ABORTING":"RESET", |
1988 | cmd->serial_number, scb->idx); | 1988 | scb->idx); |
1989 | 1989 | ||
1990 | return FALSE; | 1990 | return FALSE; |
1991 | } | 1991 | } |
@@ -1996,9 +1996,9 @@ megaraid_abort_and_reset(adapter_t *adapter, Scsi_Cmnd *cmd, int aor) | |||
1996 | * list | 1996 | * list |
1997 | */ | 1997 | */ |
1998 | printk(KERN_WARNING | 1998 | printk(KERN_WARNING |
1999 | "megaraid: %s-%lx[%x], driver owner.\n", | 1999 | "megaraid: %s-[%x], driver owner.\n", |
2000 | (aor==SCB_ABORT) ? "ABORTING":"RESET", | 2000 | (aor==SCB_ABORT) ? "ABORTING":"RESET", |
2001 | cmd->serial_number, scb->idx); | 2001 | scb->idx); |
2002 | 2002 | ||
2003 | mega_free_scb(adapter, scb); | 2003 | mega_free_scb(adapter, scb); |
2004 | 2004 | ||