qcacmn: remove qwlan version string dependency

Remove QWLAN_VERSIONSTR dependency in cmn code, so that it would
be used in driver itself, part of CONFIG_MCL/CONFIG_WIN cleanup.

Change-Id: Iec0cefe1d9e39a5b5546c7b007cc0858044cdc7b
CRs-Fixed: 2481053
This commit is contained in:
Vevek Venkatesan
2019-06-28 17:17:22 +05:30
committed by nshrivas
parent 5c3ba8908f
commit 0ac9aafb9a
3 changed files with 2 additions and 13 deletions

View File

@@ -37,9 +37,6 @@
#include "ce_reg.h" #include "ce_reg.h"
#include "ce_assignment.h" #include "ce_assignment.h"
#include "ce_tasklet.h" #include "ce_tasklet.h"
#ifndef CONFIG_WIN
#include "qwlan_version.h"
#endif
#include "qdf_module.h" #include "qdf_module.h"
#define CE_POLL_TIMEOUT 10 /* ms */ #define CE_POLL_TIMEOUT 10 /* ms */
@@ -2973,8 +2970,7 @@ int hif_wlan_enable(struct hif_softc *scn)
if (BYPASS_QMI) if (BYPASS_QMI)
return 0; return 0;
else else
return pld_wlan_enable(scn->qdf_dev->dev, &cfg, return pld_wlan_enable(scn->qdf_dev->dev, &cfg, mode);
mode, QWLAN_VERSIONSTR);
} }
#ifdef WLAN_FEATURE_EPPING #ifdef WLAN_FEATURE_EPPING

View File

@@ -76,10 +76,6 @@ enum ce_target_type {
CE_MAX_TARGET_TYPE CE_MAX_TARGET_TYPE
}; };
#ifdef CONFIG_WIN
#define QWLAN_VERSIONSTR "WIN"
#endif
enum ol_ath_hif_pkt_ecodes { enum ol_ath_hif_pkt_ecodes {
HIF_PIPE_NO_RESOURCE = 0 HIF_PIPE_NO_RESOURCE = 0
}; };

View File

@@ -26,7 +26,6 @@
#include "hif_debug.h" #include "hif_debug.h"
#include "epping_main.h" #include "epping_main.h"
#include "hif_main.h" #include "hif_main.h"
#include "qwlan_version.h"
#include "usb_api.h" #include "usb_api.h"
#define DELAY_FOR_TARGET_READY 200 /* 200ms */ #define DELAY_FOR_TARGET_READY 200 /* 200ms */
@@ -532,8 +531,7 @@ int hif_usb_bus_configure(struct hif_softc *scn)
else else
mode = PLD_MISSION; mode = PLD_MISSION;
return pld_wlan_enable(scn->qdf_dev->dev, &cfg, return pld_wlan_enable(scn->qdf_dev->dev, &cfg, mode);
mode, QWLAN_VERSIONSTR);
} }
#else #else
/** /**
@@ -706,7 +704,6 @@ void hif_usb_ramdump_handler(struct hif_opaque_softc *scn)
if (pattern == FW_ASSERT_PATTERN) { if (pattern == FW_ASSERT_PATTERN) {
HIF_ERROR("Firmware crash detected...\n"); HIF_ERROR("Firmware crash detected...\n");
HIF_ERROR("Host SW version: %s\n", QWLAN_VERSIONSTR);
HIF_ERROR("target_type: %d.target_version %d. target_revision%d.", HIF_ERROR("target_type: %d.target_version %d. target_revision%d.",
tgt_info->target_type, tgt_info->target_type,
tgt_info->target_version, tgt_info->target_version,