diff --git a/rpcs3/Input/mouse_gyro_state.cpp b/rpcs3/Input/mouse_gyro_state.cpp
index ed3c2d90cd..fa082193aa 100644
--- a/rpcs3/Input/mouse_gyro_state.cpp
+++ b/rpcs3/Input/mouse_gyro_state.cpp
@@ -100,6 +100,10 @@ void mouse_gyro_state::gyro_detect(QEvent* ev, const QWindow& win)
 
 		break;
 	}
+	default:
+	{
+		break;
+	}
 	}
 }
 
diff --git a/rpcs3/Input/mouse_gyro_state.h b/rpcs3/Input/mouse_gyro_state.h
index 6385af185c..44ab25952f 100644
--- a/rpcs3/Input/mouse_gyro_state.h
+++ b/rpcs3/Input/mouse_gyro_state.h
@@ -26,5 +26,5 @@ public:
 	void set_gyro_y(s32 steps);
 
 	void gyro_detect(QEvent* ev, const QWindow& win);
-	void gyro_run(const std::shared_ptr<Pad>& pad);
+	void apply_gyro(const std::shared_ptr<Pad>& pad);
 };
diff --git a/rpcs3/Input/pad_thread.cpp b/rpcs3/Input/pad_thread.cpp
index 7120992b52..27c1d33ee0 100644
--- a/rpcs3/Input/pad_thread.cpp
+++ b/rpcs3/Input/pad_thread.cpp
@@ -612,8 +612,7 @@ void pad_thread::operator()()
 
 			// Inject mouse-based motion sensor values into pad sensors for gyro emulation.
 			// Intentionally bound to Player 1 only.
-			auto& main_pad = m_pads[0];
-			m_mouse_gyro.gyro_run(main_pad);
+			m_mouse_gyro.gyro_run(m_pads[0]);
 		}
 
 		m_info.now_connect = connected_devices + num_ldd_pad;
diff --git a/rpcs3/rpcs3qt/gs_frame.cpp b/rpcs3/rpcs3qt/gs_frame.cpp
index b2d2622394..e93d08ae0a 100644
--- a/rpcs3/rpcs3qt/gs_frame.cpp
+++ b/rpcs3/rpcs3qt/gs_frame.cpp
@@ -1218,7 +1218,7 @@ bool gs_frame::event(QEvent* ev)
 		handle_cursor(visibility(), false, false, true);
 	}
 
-	// Hardcoded mouse-based motion input.
+	// Mouse-based motion input.
 	if (Emu.IsRunning())
 	{
 		if (auto* pad_thr = pad::get_pad_thread(true))