Commit 8845fdfa authored by Kevin Barnett's avatar Kevin Barnett Committed by Martin K. Petersen

scsi: smartpqi: eliminate redundant error messages

eliminate redundant error message during initialization
if the controller has crashed.
Reviewed-by: default avatarScott Benesh <scott.benesh@microsemi.com>
Signed-off-by: default avatarKevin Barnett <kevin.barnett@microsemi.com>
Signed-off-by: default avatarDon Brace <don.brace@microsemi.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent d91d7820
...@@ -5796,11 +5796,8 @@ static int pqi_ctrl_init(struct pqi_ctrl_info *ctrl_info) ...@@ -5796,11 +5796,8 @@ static int pqi_ctrl_init(struct pqi_ctrl_info *ctrl_info)
* commands. * commands.
*/ */
rc = sis_wait_for_ctrl_ready(ctrl_info); rc = sis_wait_for_ctrl_ready(ctrl_info);
if (rc) { if (rc)
dev_err(&ctrl_info->pci_dev->dev,
"error initializing SIS interface\n");
return rc; return rc;
}
/* /*
* Get the controller properties. This allows us to determine * Get the controller properties. This allows us to determine
......
...@@ -102,8 +102,11 @@ static int sis_wait_for_ctrl_ready_with_timeout(struct pqi_ctrl_info *ctrl_info, ...@@ -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) if (status & SIS_CTRL_KERNEL_UP)
break; break;
} }
if (time_after(jiffies, timeout)) if (time_after(jiffies, timeout)) {
dev_err(&ctrl_info->pci_dev->dev,
"controller not ready\n");
return -ETIMEDOUT; return -ETIMEDOUT;
}
msleep(SIS_CTRL_READY_POLL_INTERVAL_MSECS); msleep(SIS_CTRL_READY_POLL_INTERVAL_MSECS);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment