From 2c978788511209e93ca9423a47ea0ac11fc8641f Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 11 Sep 2020 11:45:01 +0200
Subject: [PATCH] (Input drivers) Cleanups - if we don't need userdata and it's
 just empty then just pass (void*)-1 to init function

---
 input/drivers/ctr_input.c        | 14 +-------------
 input/drivers/ps2_input.c        | 14 +-------------
 input/drivers/ps4_input.c        | 17 +----------------
 input/drivers/uwp_input.c        | 13 ++-----------
 input/drivers/xdk_xinput_input.c | 23 ++---------------------
 input/drivers/xenon360_input.c   |  3 ---
 6 files changed, 7 insertions(+), 77 deletions(-)

diff --git a/input/drivers/ctr_input.c b/input/drivers/ctr_input.c
index 6d16213d0c..6a7ad79944 100644
--- a/input/drivers/ctr_input.c
+++ b/input/drivers/ctr_input.c
@@ -27,14 +27,6 @@
 
 #include "../input_driver.h"
 
-/* TODO/FIXME -
- * fix game focus toggle */
-
-typedef struct ctr_input
-{
-   void *empty;
-} ctr_input_t;
-
 static void ctr_input_free_input(void *data)
 {
    free(data);
@@ -42,11 +34,7 @@ static void ctr_input_free_input(void *data)
 
 static void* ctr_input_init(const char *joypad_driver)
 {
-   ctr_input_t *ctr = (ctr_input_t*)calloc(1, sizeof(*ctr));
-   if (!ctr)
-      return NULL;
-
-   return ctr;
+   return (void*)-1;
 }
 
 static uint64_t ctr_input_get_capabilities(void *data)
diff --git a/input/drivers/ps2_input.c b/input/drivers/ps2_input.c
index cd6a889115..d5bc7b5600 100644
--- a/input/drivers/ps2_input.c
+++ b/input/drivers/ps2_input.c
@@ -26,24 +26,12 @@
 
 #include "../input_driver.h"
 
-typedef struct ps2_input
-{
-   void *empty;
-} ps2_input_t;
-
 static void ps2_input_free_input(void *data)
 {
    free(data);
 }
 
-static void* ps2_input_initialize(const char *joypad_driver)
-{
-   ps2_input_t *ps2 = (ps2_input_t*)calloc(1, sizeof(*ps2));
-   if (!ps2)
-      return NULL;
-
-   return ps2;
-}
+static void* ps2_input_initialize(const char *a) { return (void*)-1; }
 
 static uint64_t ps2_input_get_capabilities(void *data)
 {
diff --git a/input/drivers/ps4_input.c b/input/drivers/ps4_input.c
index 3267f3326f..3ee733d98a 100644
--- a/input/drivers/ps4_input.c
+++ b/input/drivers/ps4_input.c
@@ -29,27 +29,12 @@
 
 #include "../input_driver.h"
 
-/* TODO/FIXME -
- * fix game focus toggle */
-
-typedef struct ps4_input
-{
-   void *empty;
-} ps4_input_t;
-
 static void ps4_input_free_input(void *data)
 {
    free(data);
 }
 
-static void* ps4_input_initialize(const char *joypad_driver)
-{
-   ps4_input_t *ps4 = (ps4_input_t*)calloc(1, sizeof(*ps4));
-   if (!ps4)
-      return NULL;
-
-   return ps4;
-}
+static void* ps4_input_initialize(const char *a) { return (void*)-1; }
 
 static uint64_t ps4_input_get_capabilities(void *data)
 {
diff --git a/input/drivers/uwp_input.c b/input/drivers/uwp_input.c
index bf6bb8b37c..62cd2db567 100644
--- a/input/drivers/uwp_input.c
+++ b/input/drivers/uwp_input.c
@@ -27,12 +27,7 @@
 
 #include "../input_driver.h"
 
-// TODO: Add support for multiple mice and multiple touch
-
-typedef struct uwp_input
-{
-   void *empty;
-} uwp_input_t;
+/* TODO: Add support for multiple mice and multiple touch */
 
 static void uwp_input_free_input(void *data)
 {
@@ -41,13 +36,9 @@ static void uwp_input_free_input(void *data)
 
 static void *uwp_input_init(const char *joypad_driver)
 {
-   uwp_input_t *uwp     = (uwp_input_t*)calloc(1, sizeof(*uwp));
-   if (!uwp)
-      return NULL;
-
    input_keymaps_init_keyboard_lut(rarch_key_map_uwp);
 
-   return uwp;
+   return (void*)-1;
 }
 
 static uint64_t uwp_input_get_capabilities(void *data)
diff --git a/input/drivers/xdk_xinput_input.c b/input/drivers/xdk_xinput_input.c
index 2176dce7cc..c5707a8fa9 100644
--- a/input/drivers/xdk_xinput_input.c
+++ b/input/drivers/xdk_xinput_input.c
@@ -32,27 +32,8 @@
 
 #include "../input_driver.h"
 
-/* TODO/FIXME -
- * fix game focus toggle */
-
-typedef struct xdk_input
-{
-   void *empty;
-} xdk_input_t;
-
-static void xdk_input_free_input(void *data)
-{
-   free(data);
-}
-
-static void *xdk_input_init(const char *joypad_driver)
-{
-   xdk_input_t *xdk     = (xdk_input_t*)calloc(1, sizeof(*xdk));
-   if (!xdk)
-      return NULL;
-
-   return xdk;
-}
+static void xdk_input_free_input(void *data) { free(data); }
+static void *xdk_input_init(const char *a) { return (void*)-1; }
 
 static uint64_t xdk_input_get_capabilities(void *data)
 {
diff --git a/input/drivers/xenon360_input.c b/input/drivers/xenon360_input.c
index 40ac0ad5ae..fdfe5aed82 100644
--- a/input/drivers/xenon360_input.c
+++ b/input/drivers/xenon360_input.c
@@ -29,9 +29,6 @@
 
 /* TODO/FIXME - add joypad driver */
 
-/* TODO/FIXME -
- * fix game focus toggle */
-
 /* TODO/FIXME - static global variable */
 static uint64_t state[DEFAULT_MAX_PADS];