Commit 3969f77f authored by Cristian Ciocaltea's avatar Cristian Ciocaltea Committed by Jiri Kosina
Browse files

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: default avatarBenjamin Tissoires <bentiss@kernel.org>
Suggested-by: default avatarBenjamin Tissoires <bentiss@kernel.org>
Signed-off-by: default avatarCristian Ciocaltea <cristian.ciocaltea@collabora.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.com>
parent d335230c

drivers/hid/hid-playstation.c

+8 −6
Original line number Diff line number Diff line
@@ -1274,7 +1274,8 @@ static void dualsense_init_output_report(struct dualsense *ds, 


static inline void dualsense_schedule_work(struct dualsense *ds)

{

	guard(spinlock_irqsave)(&ds->base.lock);

	/* Using scoped_guard() instead of guard() to make sparse happy */

	scoped_guard(spinlock_irqsave, &ds->base.lock)

		if (ds->output_worker_initialized)

			schedule_work(&ds->output_worker);

}
@@ -2626,7 +2627,8 @@ static void dualshock4_remove(struct ps_device *ps_dev) 


static inline void dualshock4_schedule_work(struct dualshock4 *ds4)

{

	guard(spinlock_irqsave)(&ds4->base.lock);

	/* Using scoped_guard() instead of guard() to make sparse happy */

	scoped_guard(spinlock_irqsave, &ds4->base.lock)

		if (ds4->output_worker_initialized)

			schedule_work(&ds4->output_worker);

}