qcacld-3.0: Remove CDS fw_state handling
Previous change I8331367dd41dd0cedfa65c63f1bb3ffcb535e1c9 ("qcacld-3.0: Call icnss API to check if WLAN FW is down") relocated the source of firmware status from the wlan driver to the platform driver. The legacy fw_state handling in CDS is no longer used, so remove it. Change-Id: Id8de0bd9441ecf7bb7e5931c503e16b62cbcfbf8 CRs-Fixed: 2363229
This commit is contained in:
@@ -74,52 +74,10 @@ enum cds_driver_state {
|
|||||||
|
|
||||||
#define __CDS_IS_DRIVER_STATE(_state, _mask) (((_state) & (_mask)) == (_mask))
|
#define __CDS_IS_DRIVER_STATE(_state, _mask) (((_state) & (_mask)) == (_mask))
|
||||||
|
|
||||||
/**
|
|
||||||
* enum cds_fw_state - Firmware state
|
|
||||||
* @CDS_FW_STATE_UNINITIALIZED: Firmware is in uninitialized state.
|
|
||||||
*/
|
|
||||||
enum cds_fw_state {
|
|
||||||
CDS_FW_STATE_UNINITIALIZED = 0,
|
|
||||||
};
|
|
||||||
|
|
||||||
#define __CDS_IS_FW_STATE(_state, _mask) (((_state) & (_mask)) == (_mask))
|
|
||||||
|
|
||||||
void cds_set_driver_state(enum cds_driver_state);
|
void cds_set_driver_state(enum cds_driver_state);
|
||||||
void cds_clear_driver_state(enum cds_driver_state);
|
void cds_clear_driver_state(enum cds_driver_state);
|
||||||
enum cds_driver_state cds_get_driver_state(void);
|
enum cds_driver_state cds_get_driver_state(void);
|
||||||
|
|
||||||
/**
|
|
||||||
* cds_set_fw_state() - Set current firmware state
|
|
||||||
* @state: Firmware state to be set to.
|
|
||||||
*
|
|
||||||
* This API sets firmware state to state. This API only sets the state and
|
|
||||||
* doesn't clear states, please make sure to use cds_clear_firmware_state
|
|
||||||
* to clear any state if required.
|
|
||||||
*
|
|
||||||
* Return: None
|
|
||||||
*/
|
|
||||||
void cds_set_fw_state(enum cds_fw_state);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* cds_clear_fw_state() - Clear current fw state
|
|
||||||
* @state: Driver state to be cleared.
|
|
||||||
*
|
|
||||||
* This API clears fw state. This API only clears the state, please make
|
|
||||||
* sure to use cds_set_fw_state to set any new states.
|
|
||||||
*
|
|
||||||
* Return: None
|
|
||||||
*/
|
|
||||||
void cds_clear_fw_state(enum cds_fw_state);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* cds_get_fw_state() - Get current firmware state
|
|
||||||
*
|
|
||||||
* This API returns current firmware state stored in global context.
|
|
||||||
*
|
|
||||||
* Return: Firmware state enum
|
|
||||||
*/
|
|
||||||
enum cds_fw_state cds_get_fw_state(void);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* cds_is_driver_loading() - Is driver load in progress
|
* cds_is_driver_loading() - Is driver load in progress
|
||||||
*
|
*
|
||||||
|
@@ -175,7 +175,6 @@ struct cds_context {
|
|||||||
void *mac_context;
|
void *mac_context;
|
||||||
|
|
||||||
uint32_t driver_state;
|
uint32_t driver_state;
|
||||||
unsigned long fw_state;
|
|
||||||
|
|
||||||
qdf_event_t wma_complete_event;
|
qdf_event_t wma_complete_event;
|
||||||
|
|
||||||
|
@@ -1397,39 +1397,6 @@ void cds_clear_driver_state(enum cds_driver_state state)
|
|||||||
gp_cds_context->driver_state &= ~state;
|
gp_cds_context->driver_state &= ~state;
|
||||||
}
|
}
|
||||||
|
|
||||||
enum cds_fw_state cds_get_fw_state(void)
|
|
||||||
{
|
|
||||||
if (gp_cds_context == NULL) {
|
|
||||||
cds_err("global cds context is NULL");
|
|
||||||
|
|
||||||
return CDS_FW_STATE_UNINITIALIZED;
|
|
||||||
}
|
|
||||||
|
|
||||||
return gp_cds_context->fw_state;
|
|
||||||
}
|
|
||||||
|
|
||||||
void cds_set_fw_state(enum cds_fw_state state)
|
|
||||||
{
|
|
||||||
if (gp_cds_context == NULL) {
|
|
||||||
cds_err("global cds context is NULL: %d", state);
|
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
qdf_atomic_set_bit(state, &gp_cds_context->fw_state);
|
|
||||||
}
|
|
||||||
|
|
||||||
void cds_clear_fw_state(enum cds_fw_state state)
|
|
||||||
{
|
|
||||||
if (gp_cds_context == NULL) {
|
|
||||||
cds_err("global cds context is NULL: %d", state);
|
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
qdf_atomic_clear_bit(state, &gp_cds_context->fw_state);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* cds_alloc_context() - allocate a context within the CDS global Context
|
* cds_alloc_context() - allocate a context within the CDS global Context
|
||||||
* @module_id: module ID who's context area is being allocated.
|
* @module_id: module ID who's context area is being allocated.
|
||||||
|
Reference in New Issue
Block a user