From 9a52a4d3045485ec368b5e9ac2686d0f2ac848fe Mon Sep 17 00:00:00 2001 From: Karthik Kantamneni Date: Tue, 11 Jan 2022 12:55:56 +0530 Subject: [PATCH] qcacmn: Fix deleting unused timer in QCA6750 target In QCA6750 target hif sleep timer is not used but timer delete is performed during deinit path. Fix this so that hif sleep timer delete operation is not performed in QCA6750 target. Change-Id: I54790f3b20af4f4b265ab37b593d300032f00fa5 CRs-Fixed: 3108047 --- hif/src/ipcie/if_ipci.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/hif/src/ipcie/if_ipci.c b/hif/src/ipcie/if_ipci.c index 8be39b1aa248..084f749fb089 100644 --- a/hif/src/ipcie/if_ipci.c +++ b/hif/src/ipcie/if_ipci.c @@ -1,5 +1,6 @@ /* * Copyright (c) 2013-2021 The Linux Foundation. All rights reserved. + * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -115,21 +116,14 @@ static int hif_ce_msi_map_ce_to_irq(struct hif_softc *scn, int ce_id) int hif_ipci_bus_configure(struct hif_softc *hif_sc) { int status = 0; - struct HIF_CE_state *hif_state = HIF_GET_CE_STATE(hif_sc); uint8_t wake_ce_id; hif_ce_prepare_config(hif_sc); - /* initialize sleep state adjust variables */ - hif_state->sleep_timer_init = true; - hif_state->keep_awake_count = 0; - hif_state->fake_sleep = false; - hif_state->sleep_ticks = 0; - status = hif_wlan_enable(hif_sc); if (status) { hif_err("hif_wlan_enable error = %d", status); - goto timer_free; + return status; } A_TARGET_ACCESS_LIKELY(hif_sc); @@ -162,11 +156,6 @@ disable_wlan: A_TARGET_ACCESS_UNLIKELY(hif_sc); hif_wlan_disable(hif_sc); -timer_free: - qdf_timer_stop(&hif_state->sleep_timer); - qdf_timer_free(&hif_state->sleep_timer); - hif_state->sleep_timer_init = false; - hif_err("Failed, status = %d", status); return status; }