From bbcaf452f8452ad2b143c9ea0d2291673822308e Mon Sep 17 00:00:00 2001
From: Daniel Mentz <danielmentz@google.com>
Date: Wed, 28 Apr 2021 20:33:38 -0700
Subject: [PATCH] init.insmod.gs101.cfg: Migrate from insmod to modprobe

modprobe is smarter about locating .ko files if they are stored in
subdirectories. For example, it finds heatmap.ko regardless of whether
it's stored in /vendor/lib/modules/heatmap.ko or
/vendor/lib/modules/extra/heatmap.ko.  modprobe also loads all
dependencies automatically.  Let's migrate from insmod to modprobe.

Bug: 185184472
Change-Id: I810709b8053f3bf3bbec18bcaa37780289388e07
---
 init.insmod.gs101.cfg | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/init.insmod.gs101.cfg b/init.insmod.gs101.cfg
index 194b3df5..79002e87 100644
--- a/init.insmod.gs101.cfg
+++ b/init.insmod.gs101.cfg
@@ -7,24 +7,24 @@
 # Load common kernel modules
 # Modules here will be loaded *before* device specific modules
 install_display_drivers
-insmod|/vendor/lib/modules/mailbox-wc.ko
-insmod|/vendor/lib/modules/aoc_core.ko
-insmod|/vendor/lib/modules/aoc_channel_dev.ko
-insmod|/vendor/lib/modules/aoc_control_dev.ko
-insmod|/vendor/lib/modules/snd-soc-wm-adsp.ko
-insmod|/vendor/lib/modules/snd-soc-cs35l41.ko
-insmod|/vendor/lib/modules/aoc_char_dev.ko
-insmod|/vendor/lib/modules/aoc_usb_driver.ko
-insmod|/vendor/lib/modules/heatmap.ko
-insmod|/vendor/lib/modules/gsa.ko
-insmod|/vendor/lib/modules/gsa_gsc.ko
-insmod|/vendor/lib/modules/abrolhos.ko
-insmod|/vendor/lib/modules/haptics-cs40l2x.ko
+modprobe|mailbox-wc.ko
+modprobe|aoc_core.ko
+modprobe|aoc_channel_dev.ko
+modprobe|aoc_control_dev.ko
+modprobe|snd-soc-wm-adsp.ko
+modprobe|snd-soc-cs35l41.ko
+modprobe|aoc_char_dev.ko
+modprobe|aoc_usb_driver.ko
+modprobe|heatmap.ko
+modprobe|gsa.ko
+modprobe|gsa_gsc.ko
+modprobe|abrolhos.ko
+modprobe|haptics-cs40l2x.ko
 modprobe|slg51000-core.ko
 modprobe|slg51000-regulator.ko
 modprobe|pinctrl-slg51000.ko
 modprobe|lwis.ko
 modprobe|stmvl53l1.ko
-insmod|/vendor/lib/modules/st21nfc.ko
+modprobe|st21nfc.ko
 # All common modules loaded
 setprop|vendor.common.modules.ready