diff options
| author | Sarada Prasanna Garnayak <sgarna@codeaurora.org> | 2017-10-20 16:59:01 +0530 |
|---|---|---|
| committer | snandini <snandini@codeaurora.org> | 2017-10-30 19:12:07 -0700 |
| commit | adb6434a136216a246931453645ad741b997f207 (patch) | |
| tree | a41ca79a161f45b201557256660eb8aece41d2c1 | |
| parent | c812dbe2c5619b8c781ec12a4fb6403ad4ef6432 (diff) | |
qcacmn: add device pointer in pld snoc API
Add device pointer in all pld snoc API to support
for numerous WLAN module.
Change-Id: I2e3a296d9b40f14633e0f6e1ed6392536d854552
| -rw-r--r-- | hif/src/hif_napi.c | 11 | ||||
| -rw-r--r-- | hif/src/snoc/if_snoc.c | 3 |
2 files changed, 7 insertions, 7 deletions
diff --git a/hif/src/hif_napi.c b/hif/src/hif_napi.c index a587049f84fc..4f1d503081ab 100644 --- a/hif/src/hif_napi.c +++ b/hif/src/hif_napi.c @@ -44,7 +44,7 @@ #ifdef CONFIG_SCHED_CORE_CTL #include <linux/sched/core_ctl.h> #endif -#include <pld_snoc.h> +#include <pld_common.h> #endif #include <linux/pm.h> @@ -63,12 +63,12 @@ enum napi_decision_vector { #define ENABLE_NAPI_MASK (HIF_NAPI_INITED | HIF_NAPI_CONF_UP) #ifdef HELIUMPLUS -static inline int hif_get_irq_for_ce(int ce_id) +static inline int hif_get_irq_for_ce(struct device *dev, int ce_id) { - return pld_snoc_get_irq(ce_id); + return pld_get_irq(dev, ce_id); } #else /* HELIUMPLUS */ -static inline int hif_get_irq_for_ce(int ce_id) +static inline int hif_get_irq_for_ce(struct device *dev, int ce_id) { return -EINVAL; } @@ -173,7 +173,8 @@ int hif_napi_create(struct hif_opaque_softc *hif_ctx, napii->scale = scale; napii->id = NAPI_PIPE2ID(i); napii->hif_ctx = hif_ctx; - napii->irq = hif_get_irq_for_ce(i); + if (hif->qdf_dev) + napii->irq = hif_get_irq_for_ce(hif->qdf_dev->dev, i); if (napii->irq < 0) HIF_WARN("%s: bad IRQ value for CE %d: %d", diff --git a/hif/src/snoc/if_snoc.c b/hif/src/snoc/if_snoc.c index 9042bcf340a2..147c797fd950 100644 --- a/hif/src/snoc/if_snoc.c +++ b/hif/src/snoc/if_snoc.c @@ -38,7 +38,6 @@ #include "ce_main.h" #include "ce_tasklet.h" #include "snoc_api.h" -#include <soc/qcom/icnss.h> #include "pld_common.h" #include "qdf_util.h" #ifdef IPA_OFFLOAD @@ -389,7 +388,7 @@ QDF_STATUS hif_snoc_setup_wakeup_sources(struct hif_softc *scn, bool enable) return status; } - irq_to_wake_on = icnss_get_irq(dl_pipe); + irq_to_wake_on = pld_get_irq(scn->qdf_dev->dev, dl_pipe); if (irq_to_wake_on < 0) { HIF_ERROR("%s: failed to map ce to irq", __func__); return QDF_STATUS_E_RESOURCES; |