> -----Original Message-----
> From: Eric Biggers <ebiggers@xxxxxxxxxx>
> Sent: Tuesday, July 9, 2024 5:23 AM
> To: linux-scsi@xxxxxxxxxxxxxxx
> Cc: linux-samsung-soc@xxxxxxxxxxxxxxx; linux-fscrypt@xxxxxxxxxxxxxxx; Alim
> Akhtar <alim.akhtar@xxxxxxxxxxx>; Avri Altman <avri.altman@xxxxxxx>;
> Bart Van Assche <bvanassche@xxxxxxx>; Martin K . Petersen
> <martin.petersen@xxxxxxxxxx>; Peter Griffin <peter.griffin@xxxxxxxxxx>;
> André Draszik <andre.draszik@xxxxxxxxxx>; William McVicker
> <willmcvicker@xxxxxxxxxx>
> Subject: [PATCH v3 2/6] scsi: ufs: core: fold ufshcd_clear_keyslot() into its
> caller
>
> From: Eric Biggers <ebiggers@xxxxxxxxxx>
>
> Fold ufshcd_clear_keyslot() into its only remaining caller.
>
> Reviewed-by: Bart Van Assche <bvanassche@xxxxxxx>
> Reviewed-by: Peter Griffin <peter.griffin@xxxxxxxxxx>
> Signed-off-by: Eric Biggers <ebiggers@xxxxxxxxxx>
> ---
Reviewed-by: Alim Akhtar <alim.akhtar@xxxxxxxxxxx>
> drivers/ufs/core/ufshcd-crypto.c | 16 +++++-----------
> 1 file changed, 5 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/ufs/core/ufshcd-crypto.c b/drivers/ufs/core/ufshcd-
> crypto.c
> index debc925ae439..b4980fd91cee 100644
> --- a/drivers/ufs/core/ufshcd-crypto.c
> +++ b/drivers/ufs/core/ufshcd-crypto.c
> @@ -93,31 +93,25 @@ static int ufshcd_crypto_keyslot_program(struct
> blk_crypto_profile *profile,
>
> memzero_explicit(&cfg, sizeof(cfg));
> 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.
> */
> union ufs_crypto_cfg_entry cfg = {};
>
> 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))
> return false;
>
> --
> 2.45.2
