From c809eaebb8142ba9813dcfcc1bf3a2cd73953f45 Mon Sep 17 00:00:00 2001
From: rsuntk <rissu.ntk@gmail.com>
Date: Thu, 20 Mar 2025 14:18:01 +0000
Subject: [PATCH] staging: qcacld-3.0: Import from previous project

Signed-off-by: rsuntk <rissu.ntk@gmail.com>
---
 drivers/staging/qcacld-3.0/Kbuild                  |  5 ++++-
 drivers/staging/qcacld-3.0/Kconfig                 |  2 +-
 .../qcacld-3.0/core/hdd/src/wlan_hdd_driver_ops.c  | 14 +-------------
 .../qcacld-3.0/core/hdd/src/wlan_hdd_main.c        |  6 +-----
 4 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/drivers/staging/qcacld-3.0/Kbuild b/drivers/staging/qcacld-3.0/Kbuild
index cec528208..064091e96 100644
--- a/drivers/staging/qcacld-3.0/Kbuild
+++ b/drivers/staging/qcacld-3.0/Kbuild
@@ -9,13 +9,16 @@ ifeq ($(KERNEL_BUILD), y)
 	# These are provided in external module based builds
 	# Need to explicitly define for Kernel-based builds
 	MODNAME := wlan
-	WLAN_ROOT := drivers/staging/qcacld-3.0
+	WLAN_ROOT := $(srctree)/$(src)
 	WLAN_COMMON_ROOT := ../qca-wifi-host-cmn
 	WLAN_COMMON_INC := $(WLAN_ROOT)/$(WLAN_COMMON_ROOT)
 	WLAN_FW_API := $(WLAN_ROOT)/../fw-api/
 	WLAN_PROFILE := default
 endif
 
+# Force user build
+export TARGET_BUILD_VARIANT := user
+
 WLAN_COMMON_ROOT ?= ../qca-wifi-host-cmn
 WLAN_COMMON_INC ?= $(WLAN_ROOT)/$(WLAN_COMMON_ROOT)
 WLAN_FW_API ?= $(WLAN_ROOT)/../fw-api/
diff --git a/drivers/staging/qcacld-3.0/Kconfig b/drivers/staging/qcacld-3.0/Kconfig
index 421fa320e..b76481d5a 100644
--- a/drivers/staging/qcacld-3.0/Kconfig
+++ b/drivers/staging/qcacld-3.0/Kconfig
@@ -1,7 +1,7 @@
 comment "Qualcomm Atheros CLD WLAN module"
 
 config QCA_CLD_WLAN
-	tristate "Qualcomm Atheros CLD WLAN module"
+	bool "Qualcomm Atheros CLD WLAN module"
 	default n
 	help
 	  Add support for the Qualcomm Atheros CLD WLAN module
diff --git a/drivers/staging/qcacld-3.0/core/hdd/src/wlan_hdd_driver_ops.c b/drivers/staging/qcacld-3.0/core/hdd/src/wlan_hdd_driver_ops.c
index a52a5c9f5..bd9fada1b 100644
--- a/drivers/staging/qcacld-3.0/core/hdd/src/wlan_hdd_driver_ops.c
+++ b/drivers/staging/qcacld-3.0/core/hdd/src/wlan_hdd_driver_ops.c
@@ -47,11 +47,8 @@
 #include <qdf_notifier.h>
 #include <qdf_hang_event_notifier.h>
 
-#ifdef MODULE
-#define WLAN_MODULE_NAME  module_name(THIS_MODULE)
-#else
+// Rissu: force init wlan without sysfs!
 #define WLAN_MODULE_NAME  "wlan"
-#endif
 
 #define DISABLE_KRAIT_IDLE_PS_VAL      1
 
@@ -463,19 +460,10 @@ static int hdd_init_qdf_ctx(struct device *dev, void *bdev,
  * Return: return -EPROBE_DEFER to platform driver if return value
  * is -ENOMEM. Platform driver will try to re-probe.
  */
-#ifdef MODULE
 static int check_for_probe_defer(int ret)
 {
 	return ret;
 }
-#else
-static int check_for_probe_defer(int ret)
-{
-	if (ret == -ENOMEM)
-		return -EPROBE_DEFER;
-	return ret;
-}
-#endif
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0))
 static void hdd_abort_system_suspend(struct device *dev)
diff --git a/drivers/staging/qcacld-3.0/core/hdd/src/wlan_hdd_main.c b/drivers/staging/qcacld-3.0/core/hdd/src/wlan_hdd_main.c
index 0e16321b2..c14b73e51 100644
--- a/drivers/staging/qcacld-3.0/core/hdd/src/wlan_hdd_main.c
+++ b/drivers/staging/qcacld-3.0/core/hdd/src/wlan_hdd_main.c
@@ -196,11 +196,8 @@
 #include <cdp_txrx_ctrl.h>
 #include "wlan_global_lmac_if_api.h"
 
-#ifdef MODULE
-#define WLAN_MODULE_NAME  module_name(THIS_MODULE)
-#else
+// Rissu: force init wlan without sysfs!
 #define WLAN_MODULE_NAME  "wlan"
-#endif
 
 #ifdef TIMER_MANAGER
 #define TIMER_MANAGER_STR " +TIMER_MANAGER"
@@ -16644,7 +16641,6 @@ static void hdd_driver_unload(void)
 	osif_sync_deinit();
 
 	hdd_qdf_deinit();
-
 }
 
 #if defined (SEC_CONFIG_PSM_SYSFS)