diff options
| author |   Cai Huoqing <caihuoqing@baidu.com> | 2021-10-15 10:28:03 +0800 |
|---|---|---|
| committer |   Jiri Kosina <jkosina@suse.cz> | 2021-10-27 10:14:05 +0200 |
| commit | 3d422a4668ef0c5e30f616e9a9b4c7ac3adaade1 (patch) | |
| tree | bd8a04a41d19e33e9d3f16235075044632d36c98 /drivers/hid/wacom_sys.c | |
| parent | HID: wacom: Shrink critical section in `wacom_add_shared_data` (diff) | |
| download | wireguard-linux-3d422a4668ef0c5e30f616e9a9b4c7ac3adaade1.tar.xz wireguard-linux-3d422a4668ef0c5e30f616e9a9b4c7ac3adaade1.zip | |
HID: wacom: Make use of the helper function devm_add_action_or_reset()
The helper function devm_add_action_or_reset() will internally
call devm_add_action(), and if devm_add_action() fails then it will
execute the action mentioned and return the error code. So
use devm_add_action_or_reset() instead of devm_add_action()
to simplify the error handling, reduce the code.
Signed-off-by: Cai Huoqing <caihuoqing@baidu.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/wacom_sys.c')
| -rw-r--r-- | drivers/hid/wacom_sys.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c index 62f50e4b837d..2717d39600b4 100644 --- a/drivers/hid/wacom_sys.c +++ b/drivers/hid/wacom_sys.c @@ -894,11 +894,9 @@ static int wacom_add_shared_data(struct hid_device *hdev) wacom_wac->shared = &data->shared; - retval = devm_add_action(&hdev->dev, wacom_remove_shared_data, wacom); - if (retval) { - wacom_remove_shared_data(wacom); + retval = devm_add_action_or_reset(&hdev->dev, wacom_remove_shared_data, wacom); + if (retval) return retval; - } if (wacom_wac->features.device_type & WACOM_DEVICETYPE_TOUCH) wacom_wac->shared->touch = hdev; |