Skip to content

Commit

Permalink
HID: wacom: Make use of the helper function devm_add_action_or_reset()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Cai Huoqing authored and Jiri Kosina committed Oct 27, 2021
1 parent b764459 commit 3d422a4
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions drivers/hid/wacom_sys.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 3d422a4

Please sign in to comment.