Commit 3d422a46 authored by Cai Huoqing's avatar Cai Huoqing Committed by Jiri Kosina
Browse files

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: default avatarCai Huoqing <caihuoqing@baidu.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent b7644592

drivers/hid/wacom_sys.c

+2 −4
Original line number Diff line number Diff line
@@ -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;