From 26d1e34c1980f08b25fbcf07f89b1be7d21d7018 Mon Sep 17 00:00:00 2001
From: Peter Barker <pbarker@barker.dropbear.id.au>
Date: Fri, 28 May 2021 13:24:19 +1000
Subject: [PATCH] ArduSub: remove pointless init_optflow wrapper

Hiding a one-line call in a wrapper just adds size to the build
---
 ArduSub/Sub.h       | 3 ---
 ArduSub/sensors.cpp | 9 ---------
 ArduSub/system.cpp  | 4 ++--
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/ArduSub/Sub.h b/ArduSub/Sub.h
index ea2075dc65..68f6996184 100644
--- a/ArduSub/Sub.h
+++ b/ArduSub/Sub.h
@@ -550,9 +550,6 @@ private:
     void init_rangefinder(void);
     void read_rangefinder(void);
     bool rangefinder_alt_ok(void) const;
-#if OPTFLOW == ENABLED
-    void init_optflow();
-#endif
     void terrain_update();
     void terrain_logging();
     void init_ardupilot() override;
diff --git a/ArduSub/sensors.cpp b/ArduSub/sensors.cpp
index 686c4f0626..4f78af2531 100644
--- a/ArduSub/sensors.cpp
+++ b/ArduSub/sensors.cpp
@@ -86,15 +86,6 @@ void Sub::rpm_update(void)
 }
 #endif
 
-// initialise optical flow sensor
-#if OPTFLOW == ENABLED
-void Sub::init_optflow()
-{
-    // initialise optical flow sensor
-    optflow.init(MASK_LOG_OPTFLOW);
-}
-#endif      // OPTFLOW == ENABLED
-
 void Sub::accel_cal_update()
 {
     if (hal.util->get_soft_armed()) {
diff --git a/ArduSub/system.cpp b/ArduSub/system.cpp
index 9fac8426ee..7a731468b6 100644
--- a/ArduSub/system.cpp
+++ b/ArduSub/system.cpp
@@ -94,9 +94,9 @@ void Sub::init_ardupilot()
     wp_nav.set_terrain(&terrain);
 #endif
 
-    // init the optical flow sensor
 #if OPTFLOW == ENABLED
-    init_optflow();
+    // initialise optical flow sensor
+    optflow.init(MASK_LOG_OPTFLOW);
 #endif
 
 #if HAL_MOUNT_ENABLED