HID: hid-steam: Mutex cleanup in steam_set_lizard_mode()
authorVicki Pfau <vi@endrift.com>
Wed, 5 Feb 2025 03:55:28 +0000 (19:55 -0800)
committerJiri Kosina <jkosina@suse.com>
Fri, 7 Feb 2025 13:28:12 +0000 (14:28 +0100)
Both branches of this if/else start with mutex_lock and end with mutex_unlock.
This hoists the mutex lock/unlock outside of the if statement for simplicity.

Signed-off-by: Vicki Pfau <vi@endrift.com>
Signed-off-by: Jiri Kosina <jkosina@suse.com>
drivers/hid/hid-steam.c

index af38fc8eb34fd3b6cd9f39f2495a3aff5717294d..98ca1fea63300ae90bcaef25902d75264d3ac0b2 100644 (file)
@@ -558,15 +558,13 @@ static void steam_set_lizard_mode(struct steam_device *steam, bool enable)
        if (steam->gamepad_mode)
                enable = false;
 
+       mutex_lock(&steam->report_mutex);
        if (enable) {
-               mutex_lock(&steam->report_mutex);
                /* enable esc, enter, cursors */
                steam_send_report_byte(steam, ID_SET_DEFAULT_DIGITAL_MAPPINGS);
                /* reset settings */
                steam_send_report_byte(steam, ID_LOAD_DEFAULT_SETTINGS);
-               mutex_unlock(&steam->report_mutex);
        } else {
-               mutex_lock(&steam->report_mutex);
                /* disable esc, enter, cursor */
                steam_send_report_byte(steam, ID_CLEAR_DIGITAL_MAPPINGS);
 
@@ -578,15 +576,14 @@ static void steam_set_lizard_mode(struct steam_device *steam, bool enable)
                                SETTING_RIGHT_TRACKPAD_CLICK_PRESSURE, 0xFFFF, /* disable haptic click */
                                SETTING_STEAM_WATCHDOG_ENABLE, 0, /* disable watchdog that tests if Steam is active */
                                0);
-                       mutex_unlock(&steam->report_mutex);
                } else {
                        steam_write_settings(steam,
                                SETTING_LEFT_TRACKPAD_MODE, TRACKPAD_NONE, /* disable mouse */
                                SETTING_RIGHT_TRACKPAD_MODE, TRACKPAD_NONE, /* disable mouse */
                                0);
-                       mutex_unlock(&steam->report_mutex);
                }
        }
+       mutex_unlock(&steam->report_mutex);
 }
 
 static int steam_input_open(struct input_dev *dev)