Skip to content

Commit 3969f77

Browse files
cristiccJiri Kosina
authored andcommitted
HID: playstation: Silence sparse warnings for locking context imbalances
It seems sparse has some difficulties with guard() handling or when mixing it with scoped_guard(), as it shows a bunch lock related warnings: hid-playstation.c:1230:32: warning: context imbalance in 'dualsense_player_led_set_brightness' - wrong count at exit hid-playstation.c:1414:12: warning: context imbalance in 'dualsense_parse_report' - wrong count at exit hid-playstation.c:1615:12: warning: context imbalance in 'dualsense_play_effect' - different lock contexts for basic block hid-playstation.c:1668:13: warning: context imbalance in 'dualsense_set_lightbar' - wrong count at exit hid-playstation.c:1680:13: warning: context imbalance in 'dualsense_set_player_leds' - wrong count at exit hid-playstation.c:2185:33: warning: context imbalance in 'dualshock4_led_set_blink' - wrong count at exit hid-playstation.c:2226:33: warning: context imbalance in 'dualshock4_led_set_brightness' - wrong count at exit hid-playstation.c:2596:12: warning: context imbalance in 'dualshock4_play_effect' - different lock contexts for basic block hid-playstation.c:2634:13: warning: context imbalance in 'dualshock4_set_bt_poll_interval' - wrong count at exit hid-playstation.c:2642:13: warning: context imbalance in 'dualshock4_set_default_lightbar_colors' - wrong count at exit Silent them by switching from guard() to scoped_guard() in {dualsense|dualshock4}_schedule_work(). Reported-by: Benjamin Tissoires <bentiss@kernel.org> Suggested-by: Benjamin Tissoires <bentiss@kernel.org> Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com> Signed-off-by: Jiri Kosina <jkosina@suse.com>
1 parent d335230 commit 3969f77

1 file changed

Lines changed: 8 additions & 6 deletions

File tree

drivers/hid/hid-playstation.c

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1274,9 +1274,10 @@ static void dualsense_init_output_report(struct dualsense *ds,
12741274

12751275
static inline void dualsense_schedule_work(struct dualsense *ds)
12761276
{
1277-
guard(spinlock_irqsave)(&ds->base.lock);
1278-
if (ds->output_worker_initialized)
1279-
schedule_work(&ds->output_worker);
1277+
/* Using scoped_guard() instead of guard() to make sparse happy */
1278+
scoped_guard(spinlock_irqsave, &ds->base.lock)
1279+
if (ds->output_worker_initialized)
1280+
schedule_work(&ds->output_worker);
12801281
}
12811282

12821283
/*
@@ -2626,9 +2627,10 @@ static void dualshock4_remove(struct ps_device *ps_dev)
26262627

26272628
static inline void dualshock4_schedule_work(struct dualshock4 *ds4)
26282629
{
2629-
guard(spinlock_irqsave)(&ds4->base.lock);
2630-
if (ds4->output_worker_initialized)
2631-
schedule_work(&ds4->output_worker);
2630+
/* Using scoped_guard() instead of guard() to make sparse happy */
2631+
scoped_guard(spinlock_irqsave, &ds4->base.lock)
2632+
if (ds4->output_worker_initialized)
2633+
schedule_work(&ds4->output_worker);
26322634
}
26332635

26342636
static void dualshock4_set_bt_poll_interval(struct dualshock4 *ds4, u8 interval)

0 commit comments

Comments
 (0)