From c222b20ec1370358443fbd2b7276993f30adbcac Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 21 Aug 2015 03:58:35 +0200
Subject: [PATCH] Cleanups

---
 menu/menu.c         | 11 +----------
 menu/menu_input.h   |  5 -----
 menu/menu_iterate.c |  7 +++++--
 3 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/menu/menu.c b/menu/menu.c
index 0e3685e265..bfd33c3339 100644
--- a/menu/menu.c
+++ b/menu/menu.c
@@ -348,18 +348,9 @@ void menu_free(menu_handle_t *menu)
 int menu_iterate(retro_input_t input,
       retro_input_t old_input, retro_input_t trigger_input)
 {
-   unsigned action          = 0;
    menu_display_t *disp     = menu_display_get_ptr();
-   menu_input_t *menu_input = menu_input_get_ptr();
 
    menu_animation_update_time(disp->animation);
 
-   menu_input->joypad.state    = menu_input_frame(input, trigger_input);
-
-   action = menu_input->joypad.state;
-
-   if (menu_iterate_main(action))
-      return -1;
-
-   return 0;
+   return menu_iterate_main(menu_input_frame(input, trigger_input));
 }
diff --git a/menu/menu_input.h b/menu/menu_input.h
index 1a53bd9420..45ceb7f90d 100644
--- a/menu/menu_input.h
+++ b/menu/menu_input.h
@@ -113,11 +113,6 @@ typedef struct menu_input
 {
    struct menu_bind_state binds;
 
-   struct
-   {
-      unsigned state;
-   } joypad;
-
    struct
    {
       int16_t dx;
diff --git a/menu/menu_iterate.c b/menu/menu_iterate.c
index 89c221f33e..be13d0e68a 100644
--- a/menu/menu_iterate.c
+++ b/menu/menu_iterate.c
@@ -491,7 +491,7 @@ int menu_iterate_main(unsigned action)
          ret = menu_entry_action(&entry, selected, (enum menu_action)action);
 
          if (ret)
-            return ret;
+            goto end;
 
          menu->state.do_post_iterate = true;
          menu->state.do_render       = true;
@@ -517,7 +517,10 @@ int menu_iterate_main(unsigned action)
    if (menu->state.do_post_iterate)
       menu_input_post_iterate(&ret, action);
 
-   return ret;
+end:
+   if (ret)
+      return -1;
+   return 0;
 }
 
 int menu_iterate_main_render(void)