qcacld-3.0: Remove timer_multiplier from hdd_config

gTimerMultiplier is only ever handed down to qdf_timer_set_multiplier.
Don't bother keeping a copy in hdd_config.

Change-Id: I901cb95d4fe98efd165b8351052c6dc8a1252b74
CRs-Fixed: 2393093
这个提交包含在:
Dustin Brown
2019-02-04 12:25:40 -08:00
提交者 nshrivas
父节点 873ba9698c
当前提交 a9a8452739
修改 2 个文件,包含 3 行新增6 行删除

查看文件

@@ -392,7 +392,6 @@ struct hdd_config {
uint32_t iface_change_wait_time; uint32_t iface_change_wait_time;
uint8_t multicast_host_fw_msgs; uint8_t multicast_host_fw_msgs;
enum hdd_wext_control private_wext_control; enum hdd_wext_control private_wext_control;
uint32_t timer_multiplier;
bool enablefwprint; bool enablefwprint;
uint8_t enable_fw_log; uint8_t enable_fw_log;

查看文件

@@ -9439,7 +9439,6 @@ static void hdd_cfg_params_init(struct hdd_context *hdd_ctx)
CFG_MULTICAST_HOST_FW_MSGS); CFG_MULTICAST_HOST_FW_MSGS);
config->private_wext_control = cfg_get(psoc, CFG_PRIVATE_WEXT_CONTROL); config->private_wext_control = cfg_get(psoc, CFG_PRIVATE_WEXT_CONTROL);
config->timer_multiplier = cfg_get(psoc, CFG_TIMER_MULTIPLIER);
config->enablefwprint = cfg_get(psoc, CFG_ENABLE_FW_UART_PRINT); config->enablefwprint = cfg_get(psoc, CFG_ENABLE_FW_UART_PRINT);
config->enable_fw_log = cfg_get(psoc, CFG_ENABLE_FW_LOG); config->enable_fw_log = cfg_get(psoc, CFG_ENABLE_FW_LOG);
config->operating_channel = cfg_get(psoc, CFG_OPERATING_CHANNEL); config->operating_channel = cfg_get(psoc, CFG_OPERATING_CHANNEL);
@@ -9546,9 +9545,8 @@ struct hdd_context *hdd_context_create(struct device *dev)
hdd_cfg_params_init(hdd_ctx); hdd_cfg_params_init(hdd_ctx);
hdd_debug("setting timer multiplier: %u", qdf_timer_set_multiplier(cfg_get(hdd_ctx->psoc, CFG_TIMER_MULTIPLIER));
hdd_ctx->config->timer_multiplier); hdd_debug("set timer multiplier: %u", qdf_timer_get_multiplier());
qdf_timer_set_multiplier(hdd_ctx->config->timer_multiplier);
cds_set_fatal_event(cfg_get(hdd_ctx->psoc, cds_set_fatal_event(cfg_get(hdd_ctx->psoc,
CFG_ENABLE_FATAL_EVENT_TRIGGER)); CFG_ENABLE_FATAL_EVENT_TRIGGER));
@@ -15100,7 +15098,7 @@ void hdd_start_driver_ops_timer(int drv_op)
hdd_drv_ops_task = current; hdd_drv_ops_task = current;
qdf_timer_start(&hdd_drv_ops_inactivity_timer, qdf_timer_start(&hdd_drv_ops_inactivity_timer,
HDD_OPS_INACTIVITY_TIMEOUT * qdf_timer_get_multiplier()); HDD_OPS_INACTIVITY_TIMEOUT);
} }
/** /**