diff --git a/arch/arm64/configs/vendor/lahaina_GKI.config b/arch/arm64/configs/vendor/lahaina_GKI.config
index e1c553e29114..2951b0bad92e 100644
--- a/arch/arm64/configs/vendor/lahaina_GKI.config
+++ b/arch/arm64/configs/vendor/lahaina_GKI.config
@@ -120,6 +120,7 @@ CONFIG_CNSS_UTILS=m
 CONFIG_CNSS_GENL=m
 CONFIG_WCNSS_MEM_PRE_ALLOC=m
 CONFIG_QCOM_SECURE_BUFFER=m
+CONFIG_MSM_QBT_HANDLER=m
 CONFIG_ION_MSM_HEAPS=m
 CONFIG_QCOM_CLK_RPMH=m
 CONFIG_QCOM_LAZY_MAPPING=m
diff --git a/drivers/soc/qcom/qbt_handler.c b/drivers/soc/qcom/qbt_handler.c
index 522c3c80b574..2cc61797b300 100644
--- a/drivers/soc/qcom/qbt_handler.c
+++ b/drivers/soc/qcom/qbt_handler.c
@@ -11,6 +11,7 @@
 #include <linux/time.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/init.h>
 #include <linux/fs.h>
 #include <linux/uaccess.h>
 #include <linux/platform_device.h>
@@ -1171,7 +1172,23 @@ static struct platform_driver qbt_plat_driver = {
 	},
 };
 
-module_platform_driver(qbt_plat_driver);
+static int __init qbt_handler_init(void)
+{
+	int ret;
+
+	pr_debug("entry\n");
+	ret = platform_driver_register(&qbt_plat_driver);
+	return ret;
+}
+
+static void __exit qbt_handler_exit(void)
+{
+	pr_debug("entry\n");
+	platform_driver_unregister(&qbt_plat_driver);
+}
+
+module_init(qbt_handler_init);
+module_exit(qbt_handler_exit);
 
 MODULE_LICENSE("GPL v2");
 MODULE_DESCRIPTION("Qualcomm Technologies, Inc. QBT HANDLER");