scsi: ufs: core: fold ufshcd_clear_keyslot() into its caller

Fold ufshcd_clear_keyslot() into its only remaining caller.

Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Peter Griffin <peter.griffin@linaro.org>
Signed-off-by: Eric Biggers <ebiggers@google.com>
Link: https://lore.kernel.org/r/20240708235330.103590-3-ebiggers@kernel.org
Reviewed-by: Alim Akhtar <alim.akhtar@samsung.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/ufs/core/ufshcd-crypto.c b/drivers/ufs/core/ufshcd-crypto.c
index debc925ae439ba5a22738b184767bdf0fdcde535..b4980fd91cee7060f02da1f7398df924b48a6e37 100644 (file)
--- a/drivers/ufs/core/ufshcd-crypto.c
+++ b/drivers/ufs/core/ufshcd-crypto.c
@@ -95,8 +95,12 @@ static int ufshcd_crypto_keyslot_program(struct blk_crypto_profile *profile,
        return err;
 }
 
-static int ufshcd_clear_keyslot(struct ufs_hba *hba, int slot)
+static int ufshcd_crypto_keyslot_evict(struct blk_crypto_profile *profile,
+                                      const struct blk_crypto_key *key,
+                                      unsigned int slot)
 {
+       struct ufs_hba *hba =
+               container_of(profile, struct ufs_hba, crypto_profile);
        /*
         * Clear the crypto cfg on the device. Clearing CFGE
         * might not be sufficient, so just clear the entire cfg.
@@ -106,16 +110,6 @@ static int ufshcd_clear_keyslot(struct ufs_hba *hba, int slot)
        return ufshcd_program_key(hba, &cfg, slot);
 }
 
-static int ufshcd_crypto_keyslot_evict(struct blk_crypto_profile *profile,
-                                      const struct blk_crypto_key *key,
-                                      unsigned int slot)
-{
-       struct ufs_hba *hba =
-               container_of(profile, struct ufs_hba, crypto_profile);
-
-       return ufshcd_clear_keyslot(hba, slot);
-}
-
 bool ufshcd_crypto_enable(struct ufs_hba *hba)
 {
        if (!(hba->caps & UFSHCD_CAP_CRYPTO))