[v3] scsi: ufs: Remove unnecessary devm_kfree
diff mbox series

Message ID 20210112092128.19295-1-huobean@gmail.com
State Accepted
Commit b64750a1b65ac7a7dfaf62f75c2e211a51a7914a
Headers show
Series
  • [v3] scsi: ufs: Remove unnecessary devm_kfree
Related show

Commit Message

Bean Huo Jan. 12, 2021, 9:21 a.m. UTC
From: Bean Huo <beanhuo@micron.com>

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 <ebiggers@google.com>
Signed-off-by: Bean Huo <beanhuo@micron.com>
---

Nothing changed in this patch, just drop one patch from the patchset:
https://patchwork.kernel.org/project/linux-scsi/cover/20210111231058.14559-1-huobean@gmail.com/

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

Comments

Martin K. Petersen Jan. 13, 2021, 5:30 a.m. UTC | #1
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 Jan. 15, 2021, 4:08 a.m. UTC | #2
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

Patch
diff mbox series

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;