[SCSI] hpsa: do not require board "not ready" status after hard reset

Immediately following a hard board reset, There are some
mandatory delays during which we must not access the board
and during which we might miss the "not ready" status,
therefore it is a mistake to look for and expect to see
the "not ready" status.

Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index b146cafc50b11efe9100689a32c3dbce4693aaf4..d5f2ff9918faf3b973adf202c5c72b4f7afb14c9 100644 (file)
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -4048,23 +4048,6 @@ static int hpsa_kdump_hard_reset_controller(struct pci_dev *pdev)
           need a little pause here */
        msleep(HPSA_POST_RESET_PAUSE_MSECS);
 
-       if (!use_doorbell) {
-               /* Wait for board to become not ready, then ready.
-                * (if we used the doorbell, then we already waited 5 secs
-                * so the "not ready" state is already gone by so we
-                * won't catch it.)
-                */
-               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 reset."
-                               " Will try soft reset.\n");
-                       /* Not expected, but try soft reset later */
-                       rc = -ENOTSUPP;
-                       goto unmap_cfgtable;
-               }
-       }
        rc = hpsa_wait_for_board_state(pdev, vaddr, BOARD_READY);
        if (rc) {
                dev_warn(&pdev->dev,