diff options
| -rw-r--r-- | core/bmi/src/bmi.c | 3 | ||||
| -rw-r--r-- | core/hif/inc/hif.h | 10 | ||||
| -rw-r--r-- | core/hif/src/ce/ce_main.c | 14 | ||||
| -rw-r--r-- | core/hif/src/ce/ce_main.h | 4 | ||||
| -rw-r--r-- | core/utils/epping/src/epping_main.c | 2 |
5 files changed, 3 insertions, 30 deletions
diff --git a/core/bmi/src/bmi.c b/core/bmi/src/bmi.c index ddeab53c0197..6753f01b1bf2 100644 --- a/core/bmi/src/bmi.c +++ b/core/bmi/src/bmi.c @@ -1,5 +1,5 @@ /* - * copyright (c) 2014-2015 The Linux Foundation. All rights reserved. + * copyright (c) 2014-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -110,7 +110,6 @@ void bmi_cleanup(struct ol_softc *scn) CDF_STATUS bmi_done(struct ol_softc *scn) { CDF_STATUS status = CDF_STATUS_SUCCESS; - hif_claim_device(scn, scn); if (NO_BMI) return status; diff --git a/core/hif/inc/hif.h b/core/hif/inc/hif.h index 0adc66dafbad..3f66a7b64705 100644 --- a/core/hif/inc/hif.h +++ b/core/hif/inc/hif.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2013-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -394,14 +394,6 @@ typedef struct osdrv_callbacks { */ int hif_init(OSDRV_CALLBACKS *callbacks); -/* - * This API claims the HIF device and provides a context for handling removal. - * The device removal callback is only called when the OSDRV layer claims - * a device. The claimed context must be non-NULL */ -void hif_claim_device(struct ol_softc *scn, void *claimedContext); -/* release the claimed device */ -void hif_release_device(struct ol_softc *scn); - /* This API detaches the HTC layer from the HIF device */ void hif_detach_htc(struct ol_softc *scn); diff --git a/core/hif/src/ce/ce_main.c b/core/hif/src/ce/ce_main.c index 0b7d9d000e37..af6233c19f31 100644 --- a/core/hif/src/ce/ce_main.c +++ b/core/hif/src/ce/ce_main.c @@ -872,20 +872,6 @@ static void hif_msg_callbacks_install(struct ol_softc *scn) sizeof(hif_state->msg_callbacks_pending)); } -void hif_claim_device(struct ol_softc *scn, void *claimedContext) -{ - struct HIF_CE_state *hif_state = (struct HIF_CE_state *)scn->hif_hdl; - - hif_state->claimedContext = claimedContext; -} - -void hif_release_device(struct ol_softc *scn) -{ - struct HIF_CE_state *hif_state = (struct HIF_CE_state *)scn->hif_hdl; - - hif_state->claimedContext = NULL; -} - void hif_get_default_pipe(struct ol_softc *scn, uint8_t *ULPipe, uint8_t *DLPipe) { diff --git a/core/hif/src/ce/ce_main.h b/core/hif/src/ce/ce_main.h index 1e82e58d045f..8806bd31367d 100644 --- a/core/hif/src/ce/ce_main.h +++ b/core/hif/src/ce/ce_main.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 The Linux Foundation. All rights reserved. + * Copyright (c) 2015-2016 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -123,8 +123,6 @@ struct HIF_CE_state { /* current msg callbacks in use */ struct hif_msg_callbacks msg_callbacks_current; - void *claimedContext; - /* Target address used to signal a pending firmware event */ uint32_t fw_indicator_address; diff --git a/core/utils/epping/src/epping_main.c b/core/utils/epping/src/epping_main.c index 2fa63759009c..cfbf04cf1c1e 100644 --- a/core/utils/epping/src/epping_main.c +++ b/core/utils/epping/src/epping_main.c @@ -251,8 +251,6 @@ int epping_enable(struct device *parent_dev) } scn->htc_handle = pEpping_ctx->HTCHandle; - hif_claim_device(scn->hif_hdl, scn); - if (bmi_done(scn)) { EPPING_LOG(CDF_TRACE_LEVEL_FATAL, "%s: Failed to complete BMI phase", __func__); |