From 312a27dd204198e847ee1c82ee41627989be3567 Mon Sep 17 00:00:00 2001
From: Lucas De Marchi <lucas.demarchi@intel.com>
Date: Wed, 26 Oct 2016 18:41:47 -0200
Subject: [PATCH] AP_HAL: RCInput: rename deinit() to teardown()

---
 libraries/AP_HAL/RCInput.h             | 2 +-
 libraries/AP_HAL_Linux/RCInput_RPI.cpp | 2 +-
 libraries/AP_HAL_Linux/RCInput_RPI.h   | 2 +-
 libraries/AP_HAL_Linux/system.cpp      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libraries/AP_HAL/RCInput.h b/libraries/AP_HAL/RCInput.h
index 6824494917..d1db3b02aa 100644
--- a/libraries/AP_HAL/RCInput.h
+++ b/libraries/AP_HAL/RCInput.h
@@ -14,7 +14,7 @@ public:
      * in the C++ type system.)
      */
     virtual void init() = 0;
-    virtual void deinit() {};
+    virtual void teardown() {};
 
     /**
      * Return true if there has been new input since the last read()
diff --git a/libraries/AP_HAL_Linux/RCInput_RPI.cpp b/libraries/AP_HAL_Linux/RCInput_RPI.cpp
index c1076d5b0d..e090e535ed 100644
--- a/libraries/AP_HAL_Linux/RCInput_RPI.cpp
+++ b/libraries/AP_HAL_Linux/RCInput_RPI.cpp
@@ -421,7 +421,7 @@ RCInput_RPI::~RCInput_RPI()
     delete con_blocks;
 }
 
-void RCInput_RPI::deinit()
+void RCInput_RPI::teardown()
 {
     stop_dma();
 }
diff --git a/libraries/AP_HAL_Linux/RCInput_RPI.h b/libraries/AP_HAL_Linux/RCInput_RPI.h
index c571e66a85..a92de6a327 100644
--- a/libraries/AP_HAL_Linux/RCInput_RPI.h
+++ b/libraries/AP_HAL_Linux/RCInput_RPI.h
@@ -127,7 +127,7 @@ private:
     static void termination_handler(int signum);
     void set_sigaction();
     void set_physical_addresses(int version);
-    void deinit() override;
+    void teardown() override;
 };
 
 }
diff --git a/libraries/AP_HAL_Linux/system.cpp b/libraries/AP_HAL_Linux/system.cpp
index 52bab46718..52794183c9 100644
--- a/libraries/AP_HAL_Linux/system.cpp
+++ b/libraries/AP_HAL_Linux/system.cpp
@@ -30,7 +30,7 @@ void panic(const char *errormsg, ...)
     va_end(ap);
     UNUSED_RESULT(write(1, "\n", 1));
 
-    hal.rcin->deinit();
+    hal.rcin->teardown();
     hal.scheduler->delay_microseconds(10000);
     exit(1);
 }