From 296196c25b788a2c5195dc47e4525acc9bedf65f Mon Sep 17 00:00:00 2001
From: Daniel Mentz <danielmentz@google.com>
Date: Wed, 28 Apr 2021 20:39:25 -0700
Subject: [PATCH] init.insmod.*.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: I439fdc76fb6211b416541256c92169da12b0100d
---
 init.insmod.oriole.cfg   |  2 +-
 init.insmod.raven.cfg    |  2 +-
 init.insmod.slider.cfg   | 14 +++++++-------
 init.insmod.whitefin.cfg |  8 ++++----
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/init.insmod.oriole.cfg b/init.insmod.oriole.cfg
index 43faf93..8d7ce06 100644
--- a/init.insmod.oriole.cfg
+++ b/init.insmod.oriole.cfg
@@ -6,7 +6,7 @@
 
 # Load device specific kernel modules
 # Modules here will be loaded *after* all common modules
-insmod|/vendor/lib/modules/bcmdhd4389.ko
+modprobe|bcmdhd4389.ko
 modprobe|ftm5.ko
 modprobe|sec_touch.ko
 
diff --git a/init.insmod.raven.cfg b/init.insmod.raven.cfg
index a4a0e35..cdbf3f7 100644
--- a/init.insmod.raven.cfg
+++ b/init.insmod.raven.cfg
@@ -6,7 +6,7 @@
 
 # Load device specific kernel modules
 # Modules here will be loaded *after* all common modules
-insmod|/vendor/lib/modules/bcmdhd4389.ko
+modprobe|bcmdhd4389.ko
 modprobe|sec_touch.ko
 
 # All device specific modules loaded
diff --git a/init.insmod.slider.cfg b/init.insmod.slider.cfg
index 4c2c5d3..a877273 100644
--- a/init.insmod.slider.cfg
+++ b/init.insmod.slider.cfg
@@ -6,13 +6,13 @@
 
 # Load device specific kernel modules
 # Modules here will be loaded *after* all common modules
-insmod|/vendor/lib/modules/bcmdhd43752.ko
-insmod|/vendor/lib/modules/bcmdhd4389.ko
-insmod|/vendor/lib/modules/snd-soc-cs35l41-spi.ko
-insmod|/vendor/lib/modules/ftm5.ko
-insmod|/vendor/lib/modules/haptics-cs40l2x.ko
-insmod|/vendor/lib/modules/st33spi.ko
-insmod|/vendor/lib/modules/st54spi.ko
+modprobe|bcmdhd43752.ko
+modprobe|bcmdhd4389.ko
+modprobe|snd-soc-cs35l41-spi.ko
+modprobe|ftm5.ko
+modprobe|haptics-cs40l2x.ko
+modprobe|st33spi.ko
+modprobe|st54spi.ko
 
 # Wait for any asynchronous work to complete
 wait|/sys/class/leds/vibrator
diff --git a/init.insmod.whitefin.cfg b/init.insmod.whitefin.cfg
index 4f63434..aa49c61 100644
--- a/init.insmod.whitefin.cfg
+++ b/init.insmod.whitefin.cfg
@@ -6,10 +6,10 @@
 
 # Load device specific kernel modules
 # Modules here will be loaded *after* all common modules
-insmod|/vendor/lib/modules/bcmdhd43752.ko
-insmod|/vendor/lib/modules/snd-soc-cs35l41-i2c.ko
-insmod|/vendor/lib/modules/drv2624.ko
-insmod|/vendor/lib/modules/sec_touch.ko
+modprobe|bcmdhd43752.ko
+modprobe|snd-soc-cs35l41-i2c.ko
+modprobe|drv2624.ko
+modprobe|sec_touch.ko
 
 # All device specific modules loaded
 setprop|vendor.device.modules.ready