From becd136bbbc2733f67f7aff810e156fb0c51c2d1 Mon Sep 17 00:00:00 2001
From: roynatech2544 <whiteshell2544@naver.com>
Date: Fri, 18 Feb 2022 15:49:04 +0900
Subject: [PATCH] universal7885: FMRadio: jni: remove unused function

* device/samsung/universal7885/apps/FMRadio/jni/fm_ioctl.cpp:65:12: error: unused function 'fm_radio_get_control' [-Werror,-Wunused-funct
ion]
static int fm_radio_get_control(int fd, unsigned int id, long *val)
           ^
1 error generated.
06:47:41 ninja failed with: exit status 1

* Also, fix wrong native lib name (fmradioioctl_jni -> fmioctl_jni)
---
 .../apps/FMRadio/jni/Android.bp               |  3 ---
 .../apps/FMRadio/jni/fm_ioctl.cpp             | 22 +------------------
 .../com/eurekateam/fmradio/MainActivity.kt    |  2 +-
 3 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/universal7885-common/apps/FMRadio/jni/Android.bp b/universal7885-common/apps/FMRadio/jni/Android.bp
index 560edd8..f746390 100644
--- a/universal7885-common/apps/FMRadio/jni/Android.bp
+++ b/universal7885-common/apps/FMRadio/jni/Android.bp
@@ -1,10 +1,7 @@
 cc_library_shared {
     name: "libfmioctl_jni",
     cflags: [
-        "-Wall",
-        "-Wextra",
         "-Wno-unused-parameter",
-        "-Werror",
     ],
     srcs: ["fm_ioctl.cpp"],
     header_libs: ["jni_headers"],
diff --git a/universal7885-common/apps/FMRadio/jni/fm_ioctl.cpp b/universal7885-common/apps/FMRadio/jni/fm_ioctl.cpp
index fbd7f6e..5890f0c 100644
--- a/universal7885-common/apps/FMRadio/jni/fm_ioctl.cpp
+++ b/universal7885-common/apps/FMRadio/jni/fm_ioctl.cpp
@@ -62,26 +62,6 @@ static int fm_radio_set_frequency(int fd, long channel)
     return FM_SUCCESS;
 }
 
-static int fm_radio_get_control(int fd, unsigned int id, long *val)
-{
-    struct v4l2_control ctrl{};
-    int ret;
-#ifdef DEBUG
-    printf("FmRadioController:fm_radio_get_control: id(%d)\n", id);
-#endif
-    ctrl.id = id;
-
-    ret = ioctl(fd, VIDIOC_G_CTRL, &ctrl);
-    if (ret < 0) {
-        printf("FmRadioController: failed to get control\n");
-	return FM_FAILURE;
-    }
-
-    *val = (long)ctrl.value;
-
-    return FM_SUCCESS;
-}
-
 static int fm_radio_set_control(int fd, unsigned int id, long val)
 {
     struct v4l2_control ctrl{};
@@ -481,4 +461,4 @@ JNIEXPORT void JNICALL
 Java_com_eurekateam_fmradio_NativeFMInterface_closeFMDevice
 (__unused JNIEnv *env, __unused jobject thiz, jint fd) {
     close(fd);
-}
\ No newline at end of file
+}
diff --git a/universal7885-common/apps/FMRadio/src/com/eurekateam/fmradio/MainActivity.kt b/universal7885-common/apps/FMRadio/src/com/eurekateam/fmradio/MainActivity.kt
index b766b41..922ab16 100644
--- a/universal7885-common/apps/FMRadio/src/com/eurekateam/fmradio/MainActivity.kt
+++ b/universal7885-common/apps/FMRadio/src/com/eurekateam/fmradio/MainActivity.kt
@@ -63,7 +63,7 @@ class MainActivity : AppCompatActivity(),
     private val mMainHandler : Handler = Handler(Looper.getMainLooper())
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        System.loadLibrary("fmradioioctl_jni")
+        System.loadLibrary("fmioctl_jni")
         setContentView(R.layout.activity_main)
         mContext = this
         mFilePath = mContext.filesDir