diff options
| author |   Stephen M. Cameron <scameron@beardog.cce.hp.com> | 2011-05-03 14:59:36 -0500 |
|---|---|---|
| committer |   James Bottomley <jbottomley@parallels.com> | 2011-05-17 11:06:11 +0400 |
| commit | 2b870cb30000477e425666f9c6d83cca8fddc7c0 (patch) | |
| tree | be9d3825b3d871b73799f28981d6a7b8b2d03090 /drivers/scsi/hpsa.c | |
| parent | [SCSI] hpsa: increase time to wait for board reset (diff) | |
| download | linux-dev-2b870cb30000477e425666f9c6d83cca8fddc7c0.tar.xz linux-dev-2b870cb30000477e425666f9c6d83cca8fddc7c0.zip | |
[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>
Diffstat (limited to 'drivers/scsi/hpsa.c')
| -rw-r--r-- | drivers/scsi/hpsa.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c index 97db2e5d6d16..2a90e9a63830 100644 --- a/drivers/scsi/hpsa.c +++ b/drivers/scsi/hpsa.c @@ -3334,11 +3334,11 @@ static __devinit int hpsa_kdump_hard_reset_controller(struct pci_dev *pdev) msleep(HPSA_POST_RESET_PAUSE_MSECS); /* 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); if (rc) 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); if (rc) { dev_warn(&pdev->dev, @@ -3837,6 +3837,7 @@ static __devinit int hpsa_init_reset_devices(struct pci_dev *pdev) return -ENODEV; /* 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++) { if (hpsa_noop(pdev) == 0) break; |