mirror of
https://github.com/torvalds/linux.git
synced 2024-12-05 10:32:35 +00:00
[SCSI] hpsa: clarify messages around reset behavior
When waiting for the board to become "not ready" don't print a message saying "waiting for board to become ready" (possibly followed by a message saying "failed waiting for board to become not ready". Instead, it should be "waiting for board to reset" and "failed waiting for board to reset." Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com> Signed-off-by: James Bottomley <jbottomley@parallels.com> Signed-off-by: James Bottomley <James.Bottomley@suse.de>
This commit is contained in:
parent
2ed7127bce
commit
2b870cb300
@ -3334,11 +3334,11 @@ static __devinit int hpsa_kdump_hard_reset_controller(struct pci_dev *pdev)
|
|||||||
msleep(HPSA_POST_RESET_PAUSE_MSECS);
|
msleep(HPSA_POST_RESET_PAUSE_MSECS);
|
||||||
|
|
||||||
/* Wait for board to become not ready, then ready. */
|
/* Wait for board to become not ready, then ready. */
|
||||||
dev_info(&pdev->dev, "Waiting for board to become ready.\n");
|
dev_info(&pdev->dev, "Waiting for board to reset.\n");
|
||||||
rc = hpsa_wait_for_board_state(pdev, vaddr, BOARD_NOT_READY);
|
rc = hpsa_wait_for_board_state(pdev, vaddr, BOARD_NOT_READY);
|
||||||
if (rc)
|
if (rc)
|
||||||
dev_warn(&pdev->dev,
|
dev_warn(&pdev->dev,
|
||||||
"failed waiting for board to become not ready\n");
|
"failed waiting for board to reset\n");
|
||||||
rc = hpsa_wait_for_board_state(pdev, vaddr, BOARD_READY);
|
rc = hpsa_wait_for_board_state(pdev, vaddr, BOARD_READY);
|
||||||
if (rc) {
|
if (rc) {
|
||||||
dev_warn(&pdev->dev,
|
dev_warn(&pdev->dev,
|
||||||
@ -3837,6 +3837,7 @@ static __devinit int hpsa_init_reset_devices(struct pci_dev *pdev)
|
|||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
|
||||||
/* Now try to get the controller to respond to a no-op */
|
/* Now try to get the controller to respond to a no-op */
|
||||||
|
dev_warn(&pdev->dev, "Waiting for controller to respond to no-op\n");
|
||||||
for (i = 0; i < HPSA_POST_RESET_NOOP_RETRIES; i++) {
|
for (i = 0; i < HPSA_POST_RESET_NOOP_RETRIES; i++) {
|
||||||
if (hpsa_noop(pdev) == 0)
|
if (hpsa_noop(pdev) == 0)
|
||||||
break;
|
break;
|
||||||
|
Loading…
Reference in New Issue
Block a user