From 8fb42e2871f645e0caa42ff6105653cb7f7384ff Mon Sep 17 00:00:00 2001 From: Vevek Venkatesan Date: Mon, 22 Jun 2020 22:51:51 +0530 Subject: [PATCH] qcacmn: replace qdf with hif function for runtime_lock_deinit Since cds hif context was already NULL at the time of hif_pm_runtime_close and qdf_runtime_lock_deinit tries to get cds hif context, replacing it with hif_runtime_lock_deinit and corresponding hif_runtime_lock_init function. Change-Id: I6226d15d2930978fdb178624cc0ffd807e9b256c CRs-Fixed: 2714590 --- hif/src/pcie/if_pci.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hif/src/pcie/if_pci.c b/hif/src/pcie/if_pci.c index 4fa06fccfdab..8efbf52da386 100644 --- a/hif/src/pcie/if_pci.c +++ b/hif/src/pcie/if_pci.c @@ -1356,7 +1356,8 @@ static void hif_pm_runtime_open(struct hif_pci_softc *sc) spin_lock_init(&sc->runtime_lock); qdf_atomic_init(&sc->pm_state); - qdf_runtime_lock_init(&sc->prevent_linkdown_lock); + hif_runtime_lock_init(&sc->prevent_linkdown_lock, + "prevent_linkdown_lock"); qdf_atomic_set(&sc->pm_state, HIF_PM_RUNTIME_STATE_NONE); qdf_atomic_init(&sc->pm_stats.runtime_get); qdf_atomic_init(&sc->pm_stats.runtime_put); @@ -1444,8 +1445,9 @@ static void hif_pm_runtime_sanitize_on_ssr_exit(struct hif_pci_softc *sc) static void hif_pm_runtime_close(struct hif_pci_softc *sc) { struct hif_softc *scn = HIF_GET_SOFTC(sc); + struct hif_opaque_softc *hif_ctx = GET_HIF_OPAQUE_HDL(scn); - qdf_runtime_lock_deinit(&sc->prevent_linkdown_lock); + hif_runtime_lock_deinit(hif_ctx, sc->prevent_linkdown_lock.lock); hif_is_recovery_in_progress(scn) ? hif_pm_runtime_sanitize_on_ssr_exit(sc) :