diff --git a/input/input_driver.c b/input/input_driver.c
index dd1e2937c3..c0fd2038c4 100644
--- a/input/input_driver.c
+++ b/input/input_driver.c
@@ -164,7 +164,7 @@ bool input_driver_set_rumble_state(unsigned port,
    return false;
 }
 
-retro_input_t input_driver_keys_pressed(uint64_t *device_type)
+retro_input_t input_driver_keys_pressed(void)
 {
    int key;
    retro_input_t                ret = 0;
@@ -182,9 +182,6 @@ retro_input_t input_driver_keys_pressed(uint64_t *device_type)
       if (key >= RARCH_FIRST_META_KEY)
          state |= input->meta_key_pressed(driver->input_data, key, &device);
 
-      if (device == INPUT_DEVICE_TYPE_JOYPAD)
-         BIT64_SET(*device_type, key);
-
 #ifdef HAVE_OVERLAY
       state |= input_overlay_key_pressed(key);
 #endif
diff --git a/input/input_driver.h b/input/input_driver.h
index 020b13f12a..3e64073f1d 100644
--- a/input/input_driver.h
+++ b/input/input_driver.h
@@ -151,7 +151,7 @@ void find_input_driver(void);
 bool input_driver_set_rumble_state(unsigned port,
       enum retro_rumble_effect effect, uint16_t strength);
 
-retro_input_t input_driver_keys_pressed(uint64_t *device);
+retro_input_t input_driver_keys_pressed(void);
 
 int16_t input_driver_state(const struct retro_keybind **retro_keybinds,
       unsigned port, unsigned device, unsigned index, unsigned id);
diff --git a/runloop.c b/runloop.c
index 6ec23946e0..175139d526 100644
--- a/runloop.c
+++ b/runloop.c
@@ -655,7 +655,7 @@ static bool check_block_hotkey(driver_t *driver, settings_t *settings,
  * Returns: Input sample containg a mask of all pressed keys.
  */
 static INLINE retro_input_t input_keys_pressed(driver_t *driver,
-      settings_t *settings, global_t *global, uint64_t *devices)
+      settings_t *settings, global_t *global)
 {
    unsigned i;
    const struct retro_keybind *binds[MAX_USERS];
@@ -692,7 +692,7 @@ static INLINE retro_input_t input_keys_pressed(driver_t *driver,
                i, RETRO_DEVICE_JOYPAD, 0, RARCH_TURBO_ENABLE);
    }
 
-   ret = input_driver_keys_pressed(devices);
+   ret = input_driver_keys_pressed();
 
    for (i = 0; i < settings->input.max_users; i++)
    {
@@ -894,11 +894,10 @@ int rarch_main_iterate(unsigned *sleep_ms)
    event_cmd_state_t    cmd;
    retro_time_t current, target, to_sleep_ms;
    static retro_input_t last_input = 0;
-   uint64_t devices                = 0;
    driver_t *driver                = driver_get_ptr();
    settings_t *settings            = config_get_ptr();
    global_t   *global              = global_get_ptr();
-   retro_input_t input             = input_keys_pressed(driver, settings, global, &devices);
+   retro_input_t input             = input_keys_pressed(driver, settings, global);
    rarch_system_info_t *system     = rarch_system_info_get_ptr();
    retro_input_t old_input         = last_input;
    last_input                      = input;