2021-01-12 12:23:23

by Bean Huo

[permalink] [raw]
Subject: [PATCH v3] scsi: ufs: Remove unnecessary devm_kfree

From: Bean Huo <[email protected]>

The memory allocated with devm_kzalloc() is freed automatically
no need to explicitly call devm_kfree, so delete it and save some
instruction cycles.

Reviewed-by: Eric Biggers <[email protected]>
Signed-off-by: Bean Huo <[email protected]>
---

Nothing changed in this patch, just drop one patch from the patchset:
https://patchwork.kernel.org/project/linux-scsi/cover/[email protected]/

---
drivers/scsi/ufs/ufshcd-crypto.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/scsi/ufs/ufshcd-crypto.c b/drivers/scsi/ufs/ufshcd-crypto.c
index 07310b12a5dc..ec80ec83cf85 100644
--- a/drivers/scsi/ufs/ufshcd-crypto.c
+++ b/drivers/scsi/ufs/ufshcd-crypto.c
@@ -182,7 +182,7 @@ int ufshcd_hba_init_crypto_capabilities(struct ufs_hba *hba)
err = blk_ksm_init(&hba->ksm,
hba->crypto_capabilities.config_count + 1);
if (err)
- goto out_free_caps;
+ goto out;

hba->ksm.ksm_ll_ops = ufshcd_ksm_ops;
/* UFS only supports 8 bytes for any DUN */
@@ -208,8 +208,6 @@ int ufshcd_hba_init_crypto_capabilities(struct ufs_hba *hba)

return 0;

-out_free_caps:
- devm_kfree(hba->dev, hba->crypto_cap_array);
out:
/* Indicate that init failed by clearing UFSHCD_CAP_CRYPTO */
hba->caps &= ~UFSHCD_CAP_CRYPTO;
--
2.17.1


2021-01-13 05:33:50

by Martin K. Petersen

[permalink] [raw]
Subject: Re: [PATCH v3] scsi: ufs: Remove unnecessary devm_kfree


Bean,

> The memory allocated with devm_kzalloc() is freed automatically no
> need to explicitly call devm_kfree, so delete it and save some
> instruction cycles.

Applied to 5.12/scsi-staging, thanks!

--
Martin K. Petersen Oracle Linux Engineering

2021-01-15 05:48:41

by Martin K. Petersen

[permalink] [raw]
Subject: Re: [PATCH v3] scsi: ufs: Remove unnecessary devm_kfree

On Tue, 12 Jan 2021 10:21:28 +0100, Bean Huo wrote:

> The memory allocated with devm_kzalloc() is freed automatically
> no need to explicitly call devm_kfree, so delete it and save some
> instruction cycles.

Applied to 5.12/scsi-queue, thanks!

[1/1] scsi: ufs: Remove unnecessary devm_kfree
https://git.kernel.org/mkp/scsi/c/b64750a1b65a

--
Martin K. Petersen Oracle Linux Engineering