diff --git a/frontend/menu/menu_input_line_cb.c b/frontend/menu/menu_input_line_cb.c
index 5b51a9e016..73cadc93a3 100644
--- a/frontend/menu/menu_input_line_cb.c
+++ b/frontend/menu/menu_input_line_cb.c
@@ -171,7 +171,9 @@ void menu_poll_bind_state(struct menu_bind_state *state)
       return;
    }
 
-   input_joypad_poll(joypad);
+   if (joypad)
+      joypad->poll();
+
    for (i = 0; i < MAX_PLAYERS; i++)
    {
       for (b = 0; b < MENU_MAX_BUTTONS; b++)
diff --git a/input/apple_input.c b/input/apple_input.c
index d3c99b3cd6..f4d0a4e10a 100644
--- a/input/apple_input.c
+++ b/input/apple_input.c
@@ -512,7 +512,9 @@ static void apple_input_poll(void *data)
          &g_current_input_data.touches[i].full_x, &g_current_input_data.touches[i].full_y);
    }
 
-   input_joypad_poll(joypad);
+   if (joypad)
+      joypad->poll();
+
    g_current_input_data.pad_buttons[0] |= apple_input_get_icade_buttons();
 
    g_current_input_data.mouse_delta[0] = 0;
diff --git a/input/dinput.c b/input/dinput.c
index 1e58a74a74..cacc8bae4e 100644
--- a/input/dinput.c
+++ b/input/dinput.c
@@ -201,7 +201,8 @@ static void dinput_poll(void *data)
       di->mouse_y = point.y;
    }
 
-   input_joypad_poll(di->joypad);
+   if (di->joypad)
+      di->joypad->poll();
 }
 
 static bool dinput_keyboard_pressed(struct dinput_input *di, unsigned key)
diff --git a/input/input_common.c b/input/input_common.c
index 414ef0a4c6..ce0f0a7aea 100644
--- a/input/input_common.c
+++ b/input/input_common.c
@@ -120,12 +120,6 @@ const rarch_joypad_driver_t *input_joypad_init_first(void)
    return NULL;
 }
 
-void input_joypad_poll(const rarch_joypad_driver_t *driver)
-{
-   if (driver)
-      driver->poll();
-}
-
 const char *input_joypad_name(const rarch_joypad_driver_t *driver, unsigned joypad)
 {
    if (!driver)
diff --git a/input/input_common.h b/input/input_common.h
index f44368caf5..d72346df2e 100644
--- a/input/input_common.h
+++ b/input/input_common.h
@@ -97,7 +97,6 @@ bool input_joypad_button_raw(const rarch_joypad_driver_t *driver,
 bool input_joypad_hat_raw(const rarch_joypad_driver_t *driver,
       unsigned joypad, unsigned hat_dir, unsigned hat);
 
-void input_joypad_poll(const rarch_joypad_driver_t *driver);
 const char *input_joypad_name(const rarch_joypad_driver_t *driver, unsigned joypad);
 
 extern const rarch_joypad_driver_t dinput_joypad;
diff --git a/input/linuxraw_input.c b/input/linuxraw_input.c
index 64c68c930b..0372422563 100644
--- a/input/linuxraw_input.c
+++ b/input/linuxraw_input.c
@@ -222,7 +222,8 @@ static void linuxraw_input_poll(void *data)
          linuxraw->state[c] = pressed;
    }
 
-   input_joypad_poll(linuxraw->joypad);
+   if (linuxraw->joypad)
+      linuxraw->joypad->poll();
 }
 
 static uint64_t linuxraw_get_capabilities(void *data)
diff --git a/input/sdl_input.c b/input/sdl_input.c
index ee0a90de9d..085ebbaeec 100644
--- a/input/sdl_input.c
+++ b/input/sdl_input.c
@@ -263,7 +263,8 @@ static void sdl_input_poll(void *data)
    SDL_PumpEvents();
    sdl_input_t *sdl = (sdl_input_t*)data;
 
-   input_joypad_poll(sdl->joypad);
+   if (sdl->joypad)
+      sdl->joypad->poll();
    sdl_poll_mouse(sdl);
 }
 
diff --git a/input/udev_input.c b/input/udev_input.c
index 0cc9a012d7..5f230c6a7e 100644
--- a/input/udev_input.c
+++ b/input/udev_input.c
@@ -442,7 +442,8 @@ static void udev_input_poll(void *data)
       }
    }
 
-   input_joypad_poll(udev->joypad);
+   if (udev->joypad)
+      udev->joypad->poll();
 }
 
 static int16_t udev_mouse_state(udev_input_t *udev, unsigned id)
diff --git a/input/x11_input.c b/input/x11_input.c
index 4b497a8ff0..de41a7476a 100644
--- a/input/x11_input.c
+++ b/input/x11_input.c
@@ -283,7 +283,9 @@ static void x_input_poll(void *data)
       memset(x11->state, 0, sizeof(x11->state));
 
    x_input_poll_mouse(x11);
-   input_joypad_poll(x11->joypad);
+
+   if (x11->joypad)
+      x11->joypad->poll();
 }
 
 static void x_grab_mouse(void *data, bool state)
diff --git a/tools/retroarch-joyconfig.c b/tools/retroarch-joyconfig.c
index e7eccd327b..3c07442248 100644
--- a/tools/retroarch-joyconfig.c
+++ b/tools/retroarch-joyconfig.c
@@ -78,7 +78,9 @@ static void poll_joypad(const rarch_joypad_driver_t *driver,
       struct poll_data *data)
 {
    unsigned i;
-   input_joypad_poll(driver);
+
+   if (driver)
+      driver->poll();
 
    for (i = 0; i < MAX_BUTTONS; i++)
       data->buttons[i] = input_joypad_button_raw(driver, pad, i);