diff mbox

scsi: megaraid_sas: Do not log an error if FW successfully initializes.

Message ID 20180321210412.21106-1-vlee@freedesktop.org (mailing list archive)
State Accepted
Headers show

Commit Message

Vinson Lee March 21, 2018, 9:04 p.m. UTC
Fixes: 2d2c2331673c ("scsi: megaraid_sas: modified few prints in OCR and IOC INIT path")
Signed-off-by: Vinson Lee <vlee@freedesktop.org>
---
 drivers/scsi/megaraid/megaraid_sas_fusion.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Martin K. Petersen March 28, 2018, 10:27 p.m. UTC | #1
Kashyap/Sumit: Please review!

> Fixes: 2d2c2331673c ("scsi: megaraid_sas: modified few prints in OCR and IOC INIT path")
> Signed-off-by: Vinson Lee <vlee@freedesktop.org>
> ---
>  drivers/scsi/megaraid/megaraid_sas_fusion.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c
> index dc8e850fbfd2..7047d2e25e2c 100644
> --- a/drivers/scsi/megaraid/megaraid_sas_fusion.c
> +++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c
> @@ -1124,12 +1124,12 @@ megasas_ioc_init_fusion(struct megasas_instance *instance)
>  		goto fail_fw_init;
>  	}
>  
> -	ret = 0;
> +	return 0;
>  
>  fail_fw_init:
>  	dev_err(&instance->pdev->dev,
> -		"Init cmd return status %s for SCSI host %d\n",
> -		ret ? "FAILED" : "SUCCESS", instance->host->host_no);
> +		"Init cmd return status FAILED for SCSI host %d\n",
> +		instance->host->host_no);
>  
>  	return ret;
>  }
Shivasharan S March 29, 2018, 3:22 a.m. UTC | #2
Hi Vinson,

> Fixes: 2d2c2331673c ("scsi: megaraid_sas: modified few prints in OCR and
IOC
> INIT path")
> Signed-off-by: Vinson Lee <vlee@freedesktop.org>
> ---
>  drivers/scsi/megaraid/megaraid_sas_fusion.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>

Thanks for the patch.

Acked-by: Shivasharan S <shivasharan.srikanteshwara@broadcom.com>

Thanks,
Shivasharan
Martin K. Petersen March 30, 2018, 8:50 a.m. UTC | #3
Vinson,

> Fixes: 2d2c2331673c ("scsi: megaraid_sas: modified few prints in OCR and IOC INIT path")
> Signed-off-by: Vinson Lee <vlee@freedesktop.org>

Applied to 4.17/scsi-queue. Thanks!
Vinson Lee April 16, 2018, 5:52 a.m. UTC | #4
On Fri, Mar 30, 2018 at 1:50 AM, Martin K. Petersen
<martin.petersen@oracle.com> wrote:
>
> Vinson,
>
>> Fixes: 2d2c2331673c ("scsi: megaraid_sas: modified few prints in OCR and IOC INIT path")
>> Signed-off-by: Vinson Lee <vlee@freedesktop.org>
>
> Applied to 4.17/scsi-queue. Thanks!
>
> --
> Martin K. Petersen      Oracle Linux Engineering

Hi, Martin.

I could not find this patch in 4.17-rc1 or 4.17/scsi-queue.

Was this the correct place to look?
https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git/log/?h=4.17/scsi-queue

Cheers,
Vinson
diff mbox

Patch

diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c
index dc8e850fbfd2..7047d2e25e2c 100644
--- a/drivers/scsi/megaraid/megaraid_sas_fusion.c
+++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c
@@ -1124,12 +1124,12 @@  megasas_ioc_init_fusion(struct megasas_instance *instance)
 		goto fail_fw_init;
 	}
 
-	ret = 0;
+	return 0;
 
 fail_fw_init:
 	dev_err(&instance->pdev->dev,
-		"Init cmd return status %s for SCSI host %d\n",
-		ret ? "FAILED" : "SUCCESS", instance->host->host_no);
+		"Init cmd return status FAILED for SCSI host %d\n",
+		instance->host->host_no);
 
 	return ret;
 }