ControllerInterface: Remove unused "force" parameter

I'm not sure when this nonsense of forcing locking the mutex when it's
already taken should have ever taken effect, but let's be thankful it
isn't now. That was a badly worded sentence.

2 files changed, 6 insertions, 10 deletions

diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp
index e75df76a36..ddfde30118 100644
--- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp
@@ -135,13 +135,11 @@ void ControllerInterface::Shutdown()
 //
 // Update input for all devices, return true if all devices returned successful
 //
-bool ControllerInterface::UpdateInput(const bool force)
+bool ControllerInterface::UpdateInput()
 {
 	std::unique_lock<std::recursive_mutex> lk(update_lock, std::defer_lock);
 
-	if (force)
-		lk.lock();
-	else if (!lk.try_lock())
+	if (!lk.try_lock())
 		return false;
 
 	size_t ok_count = 0;
@@ -163,13 +161,11 @@ bool ControllerInterface::UpdateInput(const bool force)
 //
 // Update output for all devices, return true if all devices returned successful
 //
-bool ControllerInterface::UpdateOutput(const bool force)
+bool ControllerInterface::UpdateOutput()
 {
 	std::unique_lock<std::recursive_mutex> lk(update_lock, std::defer_lock);
 
-	if (force)
-		lk.lock();
-	else if (!lk.try_lock())
+	if (!lk.try_lock())
 		return false;
 
 	size_t ok_count = 0;
diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h
index 2420b65ed7..56723b123f 100644
--- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h
+++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h
@@ -120,8 +120,8 @@ public:
 	bool IsInit() const { return m_is_init; }
 
 	void UpdateReference(ControlReference* control, const ciface::Core::DeviceQualifier& default_device) const;
-	bool UpdateInput(const bool force = false);
-	bool UpdateOutput(const bool force = false);
+	bool UpdateInput();
+	bool UpdateOutput();
 
 	std::recursive_mutex update_lock;