From ecbfc7fd8a9e9b70357a019ed91ba31ce4660cec Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Mon, 5 Dec 2016 05:34:38 +0100
Subject: [PATCH] (input_driver.c) Cleanups

---
 input/input_driver.c | 22 +++++++---------------
 input/input_driver.h |  2 --
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/input/input_driver.c b/input/input_driver.c
index 30c85fb2a4..23cf75646b 100644
--- a/input/input_driver.c
+++ b/input/input_driver.c
@@ -306,7 +306,7 @@ bool input_translate_coord_viewport(
    return true;
 }
 
-const struct retro_keybind *libretro_input_binds[MAX_USERS];
+static const struct retro_keybind *libretro_input_binds[MAX_USERS];
 
 /**
  * input_poll:
@@ -322,26 +322,18 @@ void input_poll(void)
 
    input_driver_turbo_btns.count++;
 
-   if (input_driver_block_libretro_input)
+   for (i = 0; i < settings->input.max_users; i++)
    {
-      for (i = 0; i < settings->input.max_users; i++)
-      {
-         libretro_input_binds[i]                 = settings->input.binds[i];
-         input_driver_turbo_btns.frame_enable[i] = 0;
-      }
+      libretro_input_binds[i]                 = settings->input.binds[i];
+      input_driver_turbo_btns.frame_enable[i] = 0;
    }
-   else
-   {
-      const struct retro_keybind *binds[MAX_USERS];
 
+   if (!input_driver_block_libretro_input)
+   {
       for (i = 0; i < settings->input.max_users; i++)
-      {
-         binds[i]                                = settings->input.binds[i];
-         libretro_input_binds[i]                 = settings->input.binds[i];
          input_driver_turbo_btns.frame_enable[i] = current_input->input_state(
-               current_input_data, binds,
+               current_input_data, libretro_input_binds,
                i, RETRO_DEVICE_JOYPAD, 0, RARCH_TURBO_ENABLE);
-      }
    }
 
 #ifdef HAVE_OVERLAY
diff --git a/input/input_driver.h b/input/input_driver.h
index 36e07cff7c..d3e9340c34 100644
--- a/input/input_driver.h
+++ b/input/input_driver.h
@@ -330,8 +330,6 @@ bool input_driver_ungrab_mouse(void);
 
 bool input_driver_is_data_ptr_same(void *data);
 
-extern const struct retro_keybind *libretro_input_binds[MAX_USERS];
-
 extern input_driver_t input_android;
 extern input_driver_t input_sdl;
 extern input_driver_t input_dinput;