diff options
| author | wadesong <wadesong@codeaurora.org> | 2017-04-14 15:00:14 +0800 |
|---|---|---|
| committer | wadesong <wadesong@codeaurora.org> | 2017-04-14 16:25:14 +0800 |
| commit | fb52860434a968dd0b01b01287f87637408bcaa2 (patch) | |
| tree | e9a7fc36561a5d4918fcc1c3a95052050d1e94db | |
| parent | 5f3e0effe289b618e803941badfd739ccae23412 (diff) | |
qcacmn: Fix build errors introduced by data path code changes
Some data path code change didn't consider SDIO code path, so
introducing some build error for SDIO driver. Fix them in one
submission to enable ACI
Change-Id: I8a37cbf8589689294aa3730c86dd2f82a8f1f2dd
CRs-Fixed: 2033767
| -rw-r--r-- | hif/src/ce/ce_main.c | 19 | ||||
| -rw-r--r-- | hif/src/hif_main.c | 8 |
2 files changed, 19 insertions, 8 deletions
diff --git a/hif/src/ce/ce_main.c b/hif/src/ce/ce_main.c index 291fa421102b..f7ba7991b4f8 100644 --- a/hif/src/ce/ce_main.c +++ b/hif/src/ce/ce_main.c @@ -83,6 +83,7 @@ static int hif_post_recv_buffers_for_pipe(struct HIF_CE_pipe_info *pipe_info); static int hif_post_recv_buffers(struct hif_softc *scn); static void hif_config_rri_on_ddr(struct hif_softc *scn); +static void hif_clear_rri_on_ddr(struct hif_softc *scn); /** * hif_target_access_log_dump() - dump access log @@ -2172,6 +2173,7 @@ QDF_STATUS hif_ce_open(struct hif_softc *hif_sc) */ void hif_ce_close(struct hif_softc *hif_sc) { + hif_clear_rri_on_ddr(hif_sc); } /** @@ -2861,6 +2863,18 @@ static inline void hif_config_rri_on_ddr(struct hif_softc *scn) return; } + +static inline void hif_clear_rri_on_ddr(struct hif_softc *scn) +{ + if (scn && scn->vaddr_rri_on_ddr) { + qdf_mem_free_consistent(scn->qdf_dev, scn->qdf_dev->dev, + (CE_COUNT*sizeof(uint32_t)), + scn->vaddr_rri_on_ddr, scn->paddr_rri_on_ddr, + 0); + scn->vaddr_rri_on_ddr = NULL; + } + return; +} #else /** @@ -2877,6 +2891,11 @@ static inline void hif_config_rri_on_ddr(struct hif_softc *scn) { return; } + +static inline void hif_clear_rri_on_ddr(struct hif_softc *scn) +{ + return; +} #endif /** diff --git a/hif/src/hif_main.c b/hif/src/hif_main.c index 60159c890c5a..9f32a69251f5 100644 --- a/hif/src/hif_main.c +++ b/hif/src/hif_main.c @@ -446,14 +446,6 @@ void hif_close(struct hif_opaque_softc *hif_ctx) scn->target_info.hw_name = "ErrUnloading"; qdf_mem_free(hw_name); } - - if (scn->vaddr_rri_on_ddr) - qdf_mem_free_consistent(scn->qdf_dev, scn->qdf_dev->dev, - (CE_COUNT*sizeof(uint32_t)), - scn->vaddr_rri_on_ddr, scn->paddr_rri_on_ddr, - 0); - - scn->vaddr_rri_on_ddr = NULL; hif_bus_close(scn); qdf_mem_free(scn); } |