From 77de4fc3c104599d201b662c0af7768847dbe011 Mon Sep 17 00:00:00 2001 From: Bean Huo Date: Tue, 12 Jan 2021 10:21:28 +0100 Subject: [PATCH] UPSTREAM: scsi: ufs: Remove unnecessary devm_kfree() The memory allocated with devm_kzalloc() is freed automatically no need to explicitly call devm_kfree(). Delete it and save some instruction cycles. Link: https://lore.kernel.org/r/20210112092128.19295-1-huobean@gmail.com Reviewed-by: Eric Biggers Signed-off-by: Bean Huo Signed-off-by: Martin K. Petersen (cherry picked from commit b64750a1b65ac7a7dfaf62f75c2e211a51a7914a) Bug: 204438323 Change-Id: I05096acb5bd2872270e531cd6803ebcc9f35bd30 Signed-off-by: Bart Van Assche --- 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 7604c0744746..072ef2790a71 100644 --- a/drivers/scsi/ufs/ufshcd-crypto.c +++ b/drivers/scsi/ufs/ufshcd-crypto.c @@ -198,7 +198,7 @@ int ufshcd_hba_init_crypto_capabilities(struct ufs_hba *hba) err = devm_blk_ksm_init(hba->dev, &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 */ @@ -225,8 +225,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;