tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Input: zinitix - use guard notation when acquiring mutex

Guard notation simplifies code.

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

Dmitry Torokhov 79df764d 35ee8299

+9 -10
+9 -10
drivers/input/touchscreen/zinitix.c
··· 703 703 struct i2c_client *client = to_i2c_client(dev); 704 704 struct bt541_ts_data *bt541 = i2c_get_clientdata(client); 705 705 706 - mutex_lock(&bt541->input_dev->mutex); 706 + guard(mutex)(&bt541->input_dev->mutex); 707 707 708 708 if (input_device_enabled(bt541->input_dev)) 709 709 zinitix_stop(bt541); 710 - 711 - mutex_unlock(&bt541->input_dev->mutex); 712 710 713 711 return 0; 714 712 } ··· 715 717 { 716 718 struct i2c_client *client = to_i2c_client(dev); 717 719 struct bt541_ts_data *bt541 = i2c_get_clientdata(client); 718 - int ret = 0; 720 + int error; 719 721 720 - mutex_lock(&bt541->input_dev->mutex); 722 + guard(mutex)(&bt541->input_dev->mutex); 721 723 722 - if (input_device_enabled(bt541->input_dev)) 723 - ret = zinitix_start(bt541); 724 + if (input_device_enabled(bt541->input_dev)) { 725 + error = zinitix_start(bt541); 726 + if (error) 727 + return error; 728 + } 724 729 725 - mutex_unlock(&bt541->input_dev->mutex); 726 - 727 - return ret; 730 + return 0; 728 731 } 729 732 730 733 static DEFINE_SIMPLE_DEV_PM_OPS(zinitix_pm_ops, zinitix_suspend, zinitix_resume);