nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

scsi: ufs: use devm_blk_ksm_init()

Browse source 
Use the new resource-managed variant of blk_ksm_init() so that the UFS
driver doesn't have to manually call blk_ksm_destroy().

Signed-off-by: Eric Biggers <ebiggers@google.com>
Reviewed-by: Satya Tangirala <satyat@google.com>
Link: https://lore.kernel.org/r/20210121082155.111333-3-ebiggers@kernel.org
Acked-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Eric Biggers 2021-01-21 00:21:55 -08:00 committed by Ulf Hansson
parent 5851d3b042
commit d76d9d7d10
3 changed files with 2 additions and 13 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/scsi/ufs/ufshcd-crypto.c
View file

@ -179,8 +179,8 @@ int ufshcd_hba_init_crypto_capabilities(struct ufs_hba *hba)
} }
/* The actual number of configurations supported is (CFGC+1) */ /* The actual number of configurations supported is (CFGC+1) */
err = blk_ksm_init(&hba->ksm, err = devm_blk_ksm_init(hba->dev, &hba->ksm,
hba->crypto_capabilities.config_count + 1); hba->crypto_capabilities.config_count + 1);
if (err) if (err)
goto out_free_caps; goto out_free_caps;
@ -238,8 +238,3 @@ void ufshcd_crypto_setup_rq_keyslot_manager(struct ufs_hba *hba,
if (hba->caps & UFSHCD_CAP_CRYPTO) if (hba->caps & UFSHCD_CAP_CRYPTO)
blk_ksm_register(&hba->ksm, q); blk_ksm_register(&hba->ksm, q);
} }
void ufshcd_crypto_destroy_keyslot_manager(struct ufs_hba *hba)
{
blk_ksm_destroy(&hba->ksm);
}

5
drivers/scsi/ufs/ufshcd-crypto.h
View file

@ -43,8 +43,6 @@ void ufshcd_init_crypto(struct ufs_hba *hba);
void ufshcd_crypto_setup_rq_keyslot_manager(struct ufs_hba *hba, void ufshcd_crypto_setup_rq_keyslot_manager(struct ufs_hba *hba,
struct request_queue *q); struct request_queue *q);
void ufshcd_crypto_destroy_keyslot_manager(struct ufs_hba *hba);
#else /* CONFIG_SCSI_UFS_CRYPTO */ #else /* CONFIG_SCSI_UFS_CRYPTO */
static inline void ufshcd_prepare_lrbp_crypto(struct request *rq, static inline void ufshcd_prepare_lrbp_crypto(struct request *rq,
@ -69,9 +67,6 @@ static inline void ufshcd_init_crypto(struct ufs_hba *hba) { }
static inline void ufshcd_crypto_setup_rq_keyslot_manager(struct ufs_hba *hba, static inline void ufshcd_crypto_setup_rq_keyslot_manager(struct ufs_hba *hba,
struct request_queue *q) { } struct request_queue *q) { }
static inline void ufshcd_crypto_destroy_keyslot_manager(struct ufs_hba *hba)
{ }
#endif /* CONFIG_SCSI_UFS_CRYPTO */ #endif /* CONFIG_SCSI_UFS_CRYPTO */
#endif /* _UFSHCD_CRYPTO_H */ #endif /* _UFSHCD_CRYPTO_H */

1
drivers/scsi/ufs/ufshcd.c
View file

@ -9152,7 +9152,6 @@ EXPORT_SYMBOL_GPL(ufshcd_remove);
*/ */
void ufshcd_dealloc_host(struct ufs_hba *hba) void ufshcd_dealloc_host(struct ufs_hba *hba)
{ {
ufshcd_crypto_destroy_keyslot_manager(hba);
scsi_host_put(hba->host); scsi_host_put(hba->host);
} }
EXPORT_SYMBOL_GPL(ufshcd_dealloc_host); EXPORT_SYMBOL_GPL(ufshcd_dealloc_host);