Revert "ANDROID: scsi: ufs: UFS crypto variant operations API"
The ufs_hba_crypto_variant_ops support is causing lots of merge
conflicts with upstream, and it contains a lot of functionality that
vendors didn't end up using. Drop it for now; anything that's really
needed can be added back later with a proper justification.
Change-Id: I59b2de431bf770b922f319d227c2b539acaf985d
Signed-off-by: Eric Biggers <ebiggers@google.com>
diff --git a/drivers/scsi/ufs/ufshcd-crypto.h b/drivers/scsi/ufs/ufshcd-crypto.h
index 7fbc459..9578edb 100644
--- a/drivers/scsi/ufs/ufshcd-crypto.h
+++ b/drivers/scsi/ufs/ufshcd-crypto.h
@@ -10,9 +10,9 @@
#include "ufshcd.h"
#include "ufshci.h"
-static inline void ufshcd_prepare_lrbp_crypto_spec(struct ufs_hba *hba,
- struct scsi_cmnd *cmd,
- struct ufshcd_lrb *lrbp)
+static inline void ufshcd_prepare_lrbp_crypto(struct ufs_hba *hba,
+ struct scsi_cmnd *cmd,
+ struct ufshcd_lrb *lrbp)
{
struct request *rq = cmd->request;
@@ -24,18 +24,6 @@ static inline void ufshcd_prepare_lrbp_crypto_spec(struct ufs_hba *hba,
}
}
-bool ufshcd_crypto_enable_spec(struct ufs_hba *hba);
-
-struct blk_ksm_ll_ops;
-int ufshcd_hba_init_crypto_spec(struct ufs_hba *hba,
- const struct blk_ksm_ll_ops *ksm_ops);
-
-void ufshcd_crypto_setup_rq_keyslot_manager_spec(struct ufs_hba *hba,
- struct request_queue *q);
-
-void ufshcd_crypto_destroy_keyslot_manager_spec(struct ufs_hba *hba);
-
-/* Crypto Variant Ops Support */
bool ufshcd_crypto_enable(struct ufs_hba *hba);
int ufshcd_hba_init_crypto(struct ufs_hba *hba);
@@ -45,25 +33,6 @@ void ufshcd_crypto_setup_rq_keyslot_manager(struct ufs_hba *hba,
void ufshcd_crypto_destroy_keyslot_manager(struct ufs_hba *hba);
-void ufshcd_prepare_lrbp_crypto(struct ufs_hba *hba,
- struct scsi_cmnd *cmd,
- struct ufshcd_lrb *lrbp);
-
-int ufshcd_map_sg_crypto(struct ufs_hba *hba, struct ufshcd_lrb *lrbp);
-
-int ufshcd_complete_lrbp_crypto(struct ufs_hba *hba,
- struct scsi_cmnd *cmd,
- struct ufshcd_lrb *lrbp);
-
-void ufshcd_crypto_debug(struct ufs_hba *hba);
-
-int ufshcd_crypto_suspend(struct ufs_hba *hba, enum ufs_pm_op pm_op);
-
-int ufshcd_crypto_resume(struct ufs_hba *hba, enum ufs_pm_op pm_op);
-
-void ufshcd_crypto_set_vops(struct ufs_hba *hba,
- struct ufs_hba_crypto_variant_ops *crypto_vops);
-
#else /* CONFIG_SCSI_UFS_CRYPTO */
static inline void ufshcd_prepare_lrbp_crypto(struct ufs_hba *hba,
@@ -86,36 +55,6 @@ static inline void ufshcd_crypto_setup_rq_keyslot_manager(struct ufs_hba *hba,
static inline void ufshcd_crypto_destroy_keyslot_manager(struct ufs_hba *hba)
{ }
-static inline int ufshcd_map_sg_crypto(struct ufs_hba *hba,
- struct ufshcd_lrb *lrbp)
-{
- return 0;
-}
-
-static inline int ufshcd_complete_lrbp_crypto(struct ufs_hba *hba,
- struct scsi_cmnd *cmd,
- struct ufshcd_lrb *lrbp)
-{
- return 0;
-}
-
-static inline void ufshcd_crypto_debug(struct ufs_hba *hba) { }
-
-static inline int ufshcd_crypto_suspend(struct ufs_hba *hba,
- enum ufs_pm_op pm_op)
-{
- return 0;
-}
-
-static inline int ufshcd_crypto_resume(struct ufs_hba *hba,
- enum ufs_pm_op pm_op)
-{
- return 0;
-}
-
-static inline void ufshcd_crypto_set_vops(struct ufs_hba *hba,
- struct ufs_hba_crypto_variant_ops *crypto_vops) { }
-
#endif /* CONFIG_SCSI_UFS_CRYPTO */
#endif /* _UFSHCD_CRYPTO_H */