From 9beed958f7112c2876cab55a69bea2db8cf07dfd Mon Sep 17 00:00:00 2001
From: Cosmin Tanislav <demonsingur@gmail.com>
Date: Mon, 20 Sep 2021 06:46:02 +0300
Subject: veux: remove module loading from 5.4 gki directory

Change-Id: I591b4ae4bc0adaa5f57e19ccb5d06dd5f1a42fcd
---
 rootdir/bin/vendor_modprobe.sh | 19 -------------------
 rootdir/etc/init.target.rc     |  1 -
 2 files changed, 20 deletions(-)

diff --git a/rootdir/bin/vendor_modprobe.sh b/rootdir/bin/vendor_modprobe.sh
index cb54050..8f2da1f 100755
--- a/rootdir/bin/vendor_modprobe.sh
+++ b/rootdir/bin/vendor_modprobe.sh
@@ -5,30 +5,11 @@
 # Confidential and Proprietary - Qualcomm Technologies, Inc.
 #=============================================================================
 
-#default to /vendor/lib/modules
 MODULES_PATH="/vendor/lib/modules/"
-GKI_MOD_PATH="/vendor/lib/modules/5.4-gki"
 
 MODPROBE="/vendor/bin/modprobe"
 MODULES=`${MODPROBE} -d ${MODULES_PATH} -l`
 
-# Find the first non-blacklisted module and try
-# inserting it. If insertion fails the module is not
-# compatible with the current kernel. Change the modules
-# directory to gki.
-for MODULE in ${MODULES}; do
-	cat ${MODULES_PATH}/modules.blocklist | grep $MODULE
-	if [ $? -ne 0 ]; then
-		break
-	fi
-done
-
-${MODPROBE} -a -b -d ${MODULES_PATH} ${MODULE}
-if [ $? -ne 0 ];then
-	MODULES_PATH=$GKI_MOD_PATH
-	MODULES=`${MODPROBE} -d ${MODULES_PATH} -l`
-fi
-
 # Iterate over module list and modprobe them in background.
 for MODULE in ${MODULES}; do
 	${MODPROBE} -a -b -d ${MODULES_PATH} ${MODULE} &
diff --git a/rootdir/etc/init.target.rc b/rootdir/etc/init.target.rc
index 38c9a9f..c27ee5a 100644
--- a/rootdir/etc/init.target.rc
+++ b/rootdir/etc/init.target.rc
@@ -33,7 +33,6 @@ import /vendor/etc/init/hw/init.qti.kernel.rc
 
 on early-init
     exec u:r:vendor_modprobe:s0 -- /vendor/bin/vendor_modprobe.sh
-    exec u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -a -d /vendor/lib/modules q6_pdr_dlkm q6_notifier_dlkm snd_event_dlkm apr_dlkm adsp_loader_dlkm q6_dlkm native_dlkm pinctrl_lpi_dlkm swr_dlkm platform_dlkm stub_dlkm wcd_core_dlkm wsa881x_analog_dlkm bolero_cdc_dlkm va_macro_dlkm rx_macro_dlkm tx_macro_dlkm bt_fm_slim wcd938x_dlkm wcd938x_slave_dlkm wcd937x_dlkm wcd937x_slave_dlkm aw882xx_dlkm fs19xx_dlkm machine_dlkm radio-i2c-rtc6226-qca cdsprm
     wait /sys/devices/soc0/soc_id
 
 on init
-- 
cgit v1.2.3