summaryrefslogtreecommitdiff
path: root/drivers/scsi
diff options
context:
space:
mode:
authorMike Miller <mike.miller@hp.com>2011-10-13 11:44:06 -0500
committerJames Bottomley <JBottomley@Parallels.com>2011-10-20 10:16:20 -0500
commitfba63097b8614a4a158226c02eec0318f41cd24f (patch)
tree40ea0cbd92ee73231086ba74dc134a8fd650eccb /drivers/scsi
parent2d63673b4d469cf2ddba309a916090b54e31cc35 (diff)
downloadlinux-3.10-fba63097b8614a4a158226c02eec0318f41cd24f.tar.gz
linux-3.10-fba63097b8614a4a158226c02eec0318f41cd24f.tar.bz2
linux-3.10-fba63097b8614a4a158226c02eec0318f41cd24f.zip
[SCSI] hpsa: change confusing message to be more clear
The following warning message may be confusing to some users: dev_warn(&pdev->dev, "Controller claims that " "'Bit 2 doorbell reset' is " "supported, but not 'bit 5 doorbell reset'. " "Firmware update is recommended.\n"); Most users don't know or care what bit we may be hitting. Also change "recommended" to "required." Signed-off-by: Mike Miller <mike.miller@hp.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/hpsa.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index b200b736b00..9825ecf3495 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -3438,10 +3438,8 @@ static __devinit int hpsa_kdump_hard_reset_controller(struct pci_dev *pdev)
} else {
use_doorbell = misc_fw_support & MISC_FW_DOORBELL_RESET;
if (use_doorbell) {
- dev_warn(&pdev->dev, "Controller claims that "
- "'Bit 2 doorbell reset' is "
- "supported, but not 'bit 5 doorbell reset'. "
- "Firmware update is recommended.\n");
+ dev_warn(&pdev->dev, "Soft reset not supported. "
+ "Firmware update is required.\n");
rc = -ENOTSUPP; /* try soft reset */
goto unmap_cfgtable;
}