Re: [PATCH] HID: wacom: Make use of the helper function devm_add_action_or_reset()

[Jiri Kosina]

On Wed, 22 Sep 2021, Cai Huoqing wrote:

> 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@xxxxxxxxx>

CCing Jason and Ping to Ack this for the Wacom driver.

> ---
>  drivers/hid/wacom_sys.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c
> index 93f49b766376..3aed7ba249f7 100644
> --- a/drivers/hid/wacom_sys.c
> +++ b/drivers/hid/wacom_sys.c
> @@ -892,10 +892,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);
> +	retval = devm_add_action_or_reset(&hdev->dev, wacom_remove_shared_data, wacom);
>  	if (retval) {
>  		mutex_unlock(&wacom_udev_list_lock);
> -		wacom_remove_shared_data(wacom);
>  		return retval;
>  	}
>  
> -- 
> 2.25.1
> 

-- 
Jiri Kosina
SUSE Labs