Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8845fdfa authored May 03, 2017 by Kevin Barnett Committed by Martin K. Petersen Jun 12, 2017

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>

parent d91d7820

drivers/scsi/smartpqi/smartpqi_init.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -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

drivers/scsi/smartpqi/smartpqi_sis.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -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);
		}