diff mbox series

scsi: megaraid_sas: remove unnecessary kfree

Message ID 1659424740-46918-1-git-send-email-kanie@linux.alibaba.com (mailing list archive)
State Accepted
Headers show
Series scsi: megaraid_sas: remove unnecessary kfree | expand

Commit Message

Guixin Liu Aug. 2, 2022, 7:19 a.m. UTC
When alloc ctrl mem fail, the reply_map will be free in
megasas_free_ctrl_mem(), no need to free in megasas_alloc_ctrl_mem().

Signed-off-by: Guixin Liu <kanie@linux.alibaba.com>
---
 drivers/scsi/megaraid/megaraid_sas_base.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

Comments

Guixin Liu Aug. 8, 2022, 2:37 a.m. UTC | #1
Hi,

Gentle ping.

在 2022/8/2 15:19, Guixin Liu 写道:
> When alloc ctrl mem fail, the reply_map will be free in
> megasas_free_ctrl_mem(), no need to free in megasas_alloc_ctrl_mem().
>
> Signed-off-by: Guixin Liu <kanie@linux.alibaba.com>
> ---
>   drivers/scsi/megaraid/megaraid_sas_base.c | 8 ++------
>   1 file changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
> index a3e117a..f6c37a9 100644
> --- a/drivers/scsi/megaraid/megaraid_sas_base.c
> +++ b/drivers/scsi/megaraid/megaraid_sas_base.c
> @@ -7153,22 +7153,18 @@ static int megasas_alloc_ctrl_mem(struct megasas_instance *instance)
>   	switch (instance->adapter_type) {
>   	case MFI_SERIES:
>   		if (megasas_alloc_mfi_ctrl_mem(instance))
> -			goto fail;
> +			return -ENOMEM;
>   		break;
>   	case AERO_SERIES:
>   	case VENTURA_SERIES:
>   	case THUNDERBOLT_SERIES:
>   	case INVADER_SERIES:
>   		if (megasas_alloc_fusion_context(instance))
> -			goto fail;
> +			return -ENOMEM;
>   		break;
>   	}
>   
>   	return 0;
> - fail:
> -	kfree(instance->reply_map);
> -	instance->reply_map = NULL;
> -	return -ENOMEM;
>   }
>   
>   /*
Sumit Saxena Aug. 8, 2022, 10:40 a.m. UTC | #2
On Tue, Aug 2, 2022 at 12:49 PM Guixin Liu <kanie@linux.alibaba.com> wrote:
>
> When alloc ctrl mem fail, the reply_map will be free in
> megasas_free_ctrl_mem(), no need to free in megasas_alloc_ctrl_mem().
>
> Signed-off-by: Guixin Liu <kanie@linux.alibaba.com>
Looks good.
Acked-by: Sumit Saxena <sumit.saxena@broadcom.com>
Martin K. Petersen Aug. 12, 2022, 2:13 a.m. UTC | #3
Guixin,

> When alloc ctrl mem fail, the reply_map will be free in
> megasas_free_ctrl_mem(), no need to free in megasas_alloc_ctrl_mem().

Applied to 5.20/scsi-staging, thanks!
diff mbox series

Patch

diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
index a3e117a..f6c37a9 100644
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -7153,22 +7153,18 @@  static int megasas_alloc_ctrl_mem(struct megasas_instance *instance)
 	switch (instance->adapter_type) {
 	case MFI_SERIES:
 		if (megasas_alloc_mfi_ctrl_mem(instance))
-			goto fail;
+			return -ENOMEM;
 		break;
 	case AERO_SERIES:
 	case VENTURA_SERIES:
 	case THUNDERBOLT_SERIES:
 	case INVADER_SERIES:
 		if (megasas_alloc_fusion_context(instance))
-			goto fail;
+			return -ENOMEM;
 		break;
 	}
 
 	return 0;
- fail:
-	kfree(instance->reply_map);
-	instance->reply_map = NULL;
-	return -ENOMEM;
 }
 
 /*