Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Cai Huoqing <caihuoqing@baidu.com>
To:     <killertofu@gmail.com>, <Ping.Cheng@wacom.com>
CC:     <jikos@kernel.org>, <caihuoqing@baidu.com>,
        <benjamin.tissoires@redhat.com>, <linux-input@vger.kernel.org>,
        <linux-kernel@vger.kernel.org>, <Jason.Gerecke@wacom.com>,
        <skomra@gmail.com>, <joshua.dickens@wacom.com>
Subject: [PATCH v2 2/2] HID: wacom: Make use of the helper function devm_add_action_or_reset()
Date:   Fri, 15 Oct 2021 10:28:03 +0800
Message-ID: <20211015022803.3827-2-caihuoqing@baidu.com>
In-Reply-To: <20211015022803.3827-1-caihuoqing@baidu.com>
References: <20211015022803.3827-1-caihuoqing@baidu.com>
MIME-Version: 1.0
Content-Type: text/plain
Precedence: bulk

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>
---
v1->v2:
	*Sort to patch series with [PATCH v2 1/2] from Jason

 drivers/hid/wacom_sys.c | 6 ++----
 1 file 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;
-- 
2.25.1