scsi: smartpqi: eliminate redundant error messages

Orabug: 26191021, 26447813

eliminate redundant error message during initialization
if the controller has crashed.

Reviewed-by: Scott Benesh <scott.benesh@microsemi.com>
Signed-off-by: Kevin Barnett <kevin.barnett@microsemi.com>
Signed-off-by: Don Brace <don.brace@microsemi.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
(cherry picked from commit 8845fdfa92ab6eb24209f9929d6340c2f5d4a2de)
Signed-off-by: Brian Maly <brian.maly@oracle.com>

diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c
index 713059181cdbc097c7cc466879a9fa92f5950a89..cba7b8ec4b6f5af9fc91821cd662bd5ccc76ec7a 100644 (file)
--- a/drivers/scsi/smartpqi/smartpqi_init.c
+++ b/drivers/scsi/smartpqi/smartpqi_init.c
@@ -5829,11 +5829,8 @@ static int pqi_ctrl_init(struct pqi_ctrl_info *ctrl_info)
         * commands.
         */
        rc = sis_wait_for_ctrl_ready(ctrl_info);
-       if (rc) {
-               dev_err(&ctrl_info->pci_dev->dev,
-                       "error initializing SIS interface\n");
+       if (rc)
                return rc;
-       }
 
        /*
         * Get the controller properties.  This allows us to determine

diff --git a/drivers/scsi/smartpqi/smartpqi_sis.c b/drivers/scsi/smartpqi/smartpqi_sis.c
index 3155bda88550a74f6de9b9ce1ebbf82028e87fe4..d4b1cc76892199ab40a7fed83522620bdf4ebe63 100644 (file)
--- a/drivers/scsi/smartpqi/smartpqi_sis.c
+++ b/drivers/scsi/smartpqi/smartpqi_sis.c
@@ -102,8 +102,11 @@ static int sis_wait_for_ctrl_ready_with_timeout(struct pqi_ctrl_info *ctrl_info,
                        if (status & SIS_CTRL_KERNEL_UP)
                                break;
                }
-               if (time_after(jiffies, timeout))
+               if (time_after(jiffies, timeout)) {
+                       dev_err(&ctrl_info->pci_dev->dev,
+                               "controller not ready\n");
                        return -ETIMEDOUT;
+               }
                msleep(SIS_CTRL_READY_POLL_INTERVAL_MSECS);
        }