Commit d76d9d7d authored by Eric Biggers's avatar Eric Biggers Committed by Ulf Hansson
Browse files

scsi: ufs: use devm_blk_ksm_init() 



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: default avatarEric Biggers <ebiggers@google.com>
Reviewed-by: default avatarSatya Tangirala <satyat@google.com>
Link: https://lore.kernel.org/r/20210121082155.111333-3-ebiggers@kernel.org


Acked-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 5851d3b0

drivers/scsi/ufs/ufshcd-crypto.c

+2 −7
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ int ufshcd_hba_init_crypto_capabilities(struct ufs_hba *hba) 
	}



	/* 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);

	if (err)

		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)

		blk_ksm_register(&hba->ksm, q);

}
 


void ufshcd_crypto_destroy_keyslot_manager(struct ufs_hba *hba)

{

	blk_ksm_destroy(&hba->ksm);

}

drivers/scsi/ufs/ufshcd-crypto.h

+0 −5
Original line number Diff line number Diff line
@@ -43,8 +43,6 @@ void ufshcd_init_crypto(struct ufs_hba *hba); 
void ufshcd_crypto_setup_rq_keyslot_manager(struct ufs_hba *hba,

					    struct request_queue *q);



void ufshcd_crypto_destroy_keyslot_manager(struct ufs_hba *hba);



#else /* CONFIG_SCSI_UFS_CRYPTO */



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,

						struct request_queue *q) { }



static inline void ufshcd_crypto_destroy_keyslot_manager(struct ufs_hba *hba)

{ }



#endif /* CONFIG_SCSI_UFS_CRYPTO */



#endif /* _UFSHCD_CRYPTO_H */

drivers/scsi/ufs/ufshcd.c

+0 −1
Original line number Diff line number Diff line
@@ -9152,7 +9152,6 @@ EXPORT_SYMBOL_GPL(ufshcd_remove); 
 */

void ufshcd_dealloc_host(struct ufs_hba *hba)

{

	ufshcd_crypto_destroy_keyslot_manager(hba);

	scsi_host_put(hba->host);

}

EXPORT_SYMBOL_GPL(ufshcd_dealloc_host);