Commit ec99818a authored by Eric Biggers's avatar Eric Biggers Committed by Martin K. Petersen
Browse files

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



Fold ufshcd_clear_keyslot() into its only remaining caller.

Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Reviewed-by: default avatarPeter Griffin <peter.griffin@linaro.org>
Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Link: https://lore.kernel.org/r/20240708235330.103590-3-ebiggers@kernel.org


Reviewed-by: default avatarAlim Akhtar <alim.akhtar@samsung.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent c2a90eee

drivers/ufs/core/ufshcd-crypto.c

+5 −11
Original line number Diff line number Diff line
@@ -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))