From d95d85a7e798da66e99be31a81e45fdb0d5af75f Mon Sep 17 00:00:00 2001 From: Vaisakh Murali Date: Sat, 18 Mar 2023 20:12:21 +0600 Subject: [PATCH] Revert "BACKPORT: msm: ipa3: Changes to support deepsleep" This reverts commit ca0aa06061c944c632fb700a5063ffb2903f7514. --- drivers/platform/msm/ipa_fmwk/ipa_fmwk.c | 35 ------------------------ include/linux/ipa.h | 16 ----------- 2 files changed, 51 deletions(-) diff --git a/drivers/platform/msm/ipa_fmwk/ipa_fmwk.c b/drivers/platform/msm/ipa_fmwk/ipa_fmwk.c index 368a4b6d0d7f..418181b6fca8 100644 --- a/drivers/platform/msm/ipa_fmwk/ipa_fmwk.c +++ b/drivers/platform/msm/ipa_fmwk/ipa_fmwk.c @@ -613,41 +613,6 @@ bool ipa_is_ready(void) } EXPORT_SYMBOL(ipa_is_ready); -#ifdef CONFIG_DEEPSLEEP -int ipa_fmwk_deepsleep_entry_ipa(void) -{ - if (!ipa_fmwk_ctx) { - pr_err("ipa framework hasn't been initialized yet\n"); - return -EPERM; - } - - mutex_lock(&ipa_fmwk_ctx->lock); - ipa_fmwk_ctx->ipa_ready = false; - mutex_unlock(&ipa_fmwk_ctx->lock); - pr_info("IPA driver is now in exit state\n"); - - return 0; -} -EXPORT_SYMBOL(ipa_fmwk_deepsleep_entry_ipa); - -int ipa_fmwk_deepsleep_exit_ipa(void) -{ - if (!ipa_fmwk_ctx) { - pr_err("ipa framework hasn't been initialized yet\n"); - return -EPERM; - } - - mutex_lock(&ipa_fmwk_ctx->lock); - ipa_trigger_ipa_ready_cbs(); - ipa_fmwk_ctx->ipa_ready = true; - mutex_unlock(&ipa_fmwk_ctx->lock); - pr_info("IPA driver is now in ready state\n"); - return 0; -} -EXPORT_SYMBOL(ipa_fmwk_deepsleep_exit_ipa); -#endif - - int ipa_register_ipa_ready_cb(void(*ipa_ready_cb)(void *user_data), void *user_data) { diff --git a/include/linux/ipa.h b/include/linux/ipa.h index 0c4d6c1ea779..fa528096b133 100644 --- a/include/linux/ipa.h +++ b/include/linux/ipa.h @@ -1766,12 +1766,6 @@ int ipa_get_ep_mapping(enum ipa_client_type client); bool ipa_is_ready(void); -#ifdef CONFIG_DEEPSLEEP -int ipa_fmwk_deepsleep_entry_ipa(void); - -int ipa_fmwk_deepsleep_exit_ipa(void); -#endif - enum ipa_hw_type ipa_get_hw_type(void); const struct ipa_gsi_ep_config *ipa_get_gsi_ep_info( @@ -2179,16 +2173,6 @@ static inline enum ipa_hw_type ipa_get_hw_type(void) return IPA_HW_None; } -static inline int ipa_fmwk_deepsleep_entry_ipa(void) -{ - return -EPERM; -} - -static inline int ipa_fmwk_deepsleep_exit_ipa(void) -{ - return -EPERM; -} - static inline int ipa_register_ipa_ready_cb( void (*ipa_ready_cb)(void *user_data), void *user_data)