From patchwork Thu Mar 2 14:47:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= X-Patchwork-Id: 63447 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp4273815wrd; Thu, 2 Mar 2023 06:52:03 -0800 (PST) X-Google-Smtp-Source: AK7set+M+UViFsxXCGSVfZQeu7YYSjn1IM/q88dRYx2tHivmuY5s02jeaTgqy5EK3p1lpLL+Mh7g X-Received: by 2002:a17:902:e851:b0:19c:f16c:5cb4 with SMTP id t17-20020a170902e85100b0019cf16c5cb4mr12146666plg.1.1677768722719; Thu, 02 Mar 2023 06:52:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677768722; cv=none; d=google.com; s=arc-20160816; b=jT6PaEX0sIj9JEYvXU/NMqnn29f5h5tdoUq0rlTMHqJjawqd5LYZGesH75JDR+QzXs iAOn8HgqOaiIG83xeswFEIhxE8tkCILScF/ZUDpXR2/vNEP89s7/QAgf3ZgkgvnjkjUI HWWHlTAk0uwGXozGb3ukqa7z8Ixia0kJOKAah1QFbUUPDgY/CNmFDbuft65szVm2e0D3 YV+J6P3RKZ9Vprgc+Lj0s7NEw3upk0qMezTYMVQqxFMX5qNOwmEDrEdou8ebRNl61z/K q0YGqUrazlJU/KuzN8Uzh+eLoI6mPL7lfLABot4y2tlZN5T+wqzJu+9Tp2+NmPs7WUTX wJ7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=0+JtW1EDwYJLuN3sG8DhWyTsP524VcWmXeMfSiDUSz8=; b=m5P9gIjmEJqcrmMC473xgxlfRNFaLrpOCDgyvrjZwwE9ee4+ewlGFokoncSV6G9usr nJpyNWxUQP9vYz9+BPKN9/skVWFwpIc0m0qqNxfqYMA9AHIq1Q/Tjjd2W5RwvO6qtCu8 FwaJdHqIaLBvr3ElbaWHFhaUb4Gzqd/Qtg/ImYanqiIjaf823oKu28GMRKNIYkM1mpGL 8R3otHKj2yZHyWjw9+PNXiGCAxcnrWKFUI80tD5m2NrfqAPb8GP8Z8B34u0BjuGMHWvG cDrOmn8aQtd43HvES9nT3nR+THVZJVJV090aL8I7A+7fNKw79cbe75m6Wguwr43+zHaZ Vqdg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e123-20020a636981000000b004fbe5ede678si16050433pgc.3.2023.03.02.06.51.48; Thu, 02 Mar 2023 06:52:02 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230190AbjCBOs4 (ORCPT + 99 others); Thu, 2 Mar 2023 09:48:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38906 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230038AbjCBOrz (ORCPT ); Thu, 2 Mar 2023 09:47:55 -0500 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 424F03C24 for ; Thu, 2 Mar 2023 06:47:53 -0800 (PST) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1pXkDg-000451-8n; Thu, 02 Mar 2023 15:47:44 +0100 Received: from [2a0a:edc0:0:900:1d::77] (helo=ptz.office.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1pXkDe-001Lsc-Sl; Thu, 02 Mar 2023 15:47:42 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1pXkDd-001Zqs-Ur; Thu, 02 Mar 2023 15:47:41 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: AceLan Kao , Hans de Goede , Mark Gross Cc: kernel@pengutronix.de, Greg Kroah-Hartman , platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 25/29] platform/x86: intel: vbtn: Convert to platform remove callback returning void Date: Thu, 2 Mar 2023 15:47:28 +0100 Message-Id: <20230302144732.1903781-26-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230302144732.1903781-1-u.kleine-koenig@pengutronix.de> References: <20230302144732.1903781-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1808; i=u.kleine-koenig@pengutronix.de; h=from:subject; bh=4FZ1eGAX+X12ziQYLanXNlvTUV1hJsemEvhnUGuqfu0=; b=owEBbQGS/pANAwAKAcH8FHityuwJAcsmYgBkALbtPQx7WWOR6o/HDFF3FfDIA4I2AEt1OmhLd At+L54FrseJATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCZAC27QAKCRDB/BR4rcrs Cfk6B/42GMBgRTuXwK3tgegTCPgEvh66TJeY3zga6GDbSZDjbOL1VJ4YF8MoNiPjI+2fUe15wd1 pQeyoHXuxGjlRYudlHcx6pmVyBIAjYUaaH8/k5lE9cXwku6V9sPs7hk+McfbSyYHM8p7hLkMl5n 5h+mhDYIHwJ/TrdLMaFeOYxGLauyNEQvaizZVq8zh/Qiid/wz0zefNaTSriAjC3AS+y1fl0SjyE Wht2m4tgxrjOPLthSMuICiwQ6hdzelGYb9ZnLaBIupruRfMM6p61r7+TC5Hry9LIhuh3dhplVkc UYE5lBP5y7xLkXXjAzm2TN8LEUs6lQyNVpsGDByJAM+w1cay X-Developer-Key: i=u.kleine-koenig@pengutronix.de; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: ukl@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759268016034498207?= X-GMAIL-MSGID: =?utf-8?q?1759268016034498207?= The .remove() callback for a platform driver returns an int which makes many driver authors wrongly assume it's possible to do error handling by returning an error code. However the value returned is (mostly) ignored and this typically results in resource leaks. To improve here there is a quest to make the remove callback return void. In the first step of this quest all drivers are converted to .remove_new() which already returns void. Trivially convert this driver from always returning zero in the remove callback to the void returning variant. Signed-off-by: Uwe Kleine-König --- drivers/platform/x86/intel/vbtn.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/platform/x86/intel/vbtn.c b/drivers/platform/x86/intel/vbtn.c index c5e4e35c8d20..6fa1735ad7a4 100644 --- a/drivers/platform/x86/intel/vbtn.c +++ b/drivers/platform/x86/intel/vbtn.c @@ -325,18 +325,12 @@ static int intel_vbtn_probe(struct platform_device *device) return 0; } -static int intel_vbtn_remove(struct platform_device *device) +static void intel_vbtn_remove(struct platform_device *device) { acpi_handle handle = ACPI_HANDLE(&device->dev); device_init_wakeup(&device->dev, false); acpi_remove_notify_handler(handle, ACPI_DEVICE_NOTIFY, notify_handler); - - /* - * Even if we failed to shut off the event stream, we can still - * safely detach from the device. - */ - return 0; } static int intel_vbtn_pm_prepare(struct device *dev) @@ -377,7 +371,7 @@ static struct platform_driver intel_vbtn_pl_driver = { .pm = &intel_vbtn_pm_ops, }, .probe = intel_vbtn_probe, - .remove = intel_vbtn_remove, + .remove_new = intel_vbtn_remove, }; static acpi_status __init