diff options
| author | Kevin Barnett <kevin.barnett@hpe.com> | 2017-05-04 01:53:36 +0200 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2017-06-13 02:48:02 +0200 |
| commit | 8845fdfa92ab6eb24209f9929d6340c2f5d4a2de (patch) | |
| tree | 695aabffcded572e0d28e4a28d8c13461971d85b /drivers/scsi/smartpqi | |
| parent | scsi: smartpqi: make pdev pointer names consistent (diff) | |
| download | linux-8845fdfa92ab6eb24209f9929d6340c2f5d4a2de.tar.xz linux-8845fdfa92ab6eb24209f9929d6340c2f5d4a2de.zip | |
scsi: smartpqi: eliminate redundant error messages
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>
Diffstat (limited to 'drivers/scsi/smartpqi')
| -rw-r--r-- | drivers/scsi/smartpqi/smartpqi_init.c | 5 | ||||
| -rw-r--r-- | drivers/scsi/smartpqi/smartpqi_sis.c | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c index 0083ea4ff81a..fa21dd4db01b 100644 --- a/drivers/scsi/smartpqi/smartpqi_init.c +++ b/drivers/scsi/smartpqi/smartpqi_init.c @@ -5796,11 +5796,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 3155bda88550..d4b1cc768921 100644 --- 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); } |