From patchwork Mon Dec 4 21:52:11 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: 173572 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp3060282vqy; Mon, 4 Dec 2023 13:52:40 -0800 (PST) X-Google-Smtp-Source: AGHT+IEOmp0NMBcMxfQNNujfze/zhsi04OQGPb9lmAfy6YLacCs6tlrE9I0wQI4Z6iQ/j7T6bj/X X-Received: by 2002:a05:6a20:8e1e:b0:18c:6c2:55e0 with SMTP id y30-20020a056a208e1e00b0018c06c255e0mr2822330pzj.22.1701726760250; Mon, 04 Dec 2023 13:52:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701726760; cv=none; d=google.com; s=arc-20160816; b=NCf1mmAP6LuwArC4tcIbADigGTKSuf66dmZXt+37OY/ilJtJ0Lj1Ll11/YNpvh7Clf RlVrXNil1Lwiok1MPBSdqKEI9xzKxOsgIWlKD8GbCWWDZKQq7GHJf6uwDSBp3lil+OnV rnqCa5HPxaPTumzNagtNGNeXzfU6YgPYs2+5HDkS8gAiqM7EkHJJH+efwPmbjlVVSS7N 7RMDKGmWtBlGjGbHxkK5928fXshODKANeMDoCPiCjC2yRS8GYqot+DdL4mSSla6y3oN2 Yrrry5ztjnH3u0akv/MsiMG1aXLTXH2DO37RWgNojl+a+eR2R2uSWDbE+Ldw5Uu0O98S 5YTg== 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=zOCYjHXq3/arBYhSb5XvDBcZAKVFIsP5rFT1UUqr6XA=; fh=YXCmL+XWB2GhHhZ7UtKpcVugjQRNdR2dr6cseVYg3Jg=; b=ILQNasjhCcbsr7/gtByu3AmBy4J092854lgF6/XN9cQSoeTz0D6nUuncDpiVae9Cpc p2J6sWwSQRck98Zty2Wtkw9TTRdRhnQIMnV4WPBmF/kpdjA28ieTyPEEQ4qJ3HkEDrRP +fYKzOMk1A+h0o/kcCGr3jaj90DHjzb5wGeldcS9FsM2GI7zwjsHr+mb6bJI0j+VgG+f k6wSonDWadphgiumFhmsqOlW4fk7FoJXCvNUN566Lz/zUlB0sAdWgnOvYjSPc8l/u8ob j+Ir5QLx/EaqcGuV9V96bJFRCgM/A1ZL5k7+Fp6Z3drO66ovQT2pW6xLtnnnoW+M4GpZ Voqw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id o15-20020a63f14f000000b005c65e697bb3si4353999pgk.518.2023.12.04.13.52.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Dec 2023 13:52:40 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id D4F8F80ABB21; Mon, 4 Dec 2023 13:52:34 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234392AbjLDVwZ (ORCPT + 99 others); Mon, 4 Dec 2023 16:52:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34720 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234329AbjLDVwY (ORCPT ); Mon, 4 Dec 2023 16:52:24 -0500 Received: from metis.whiteo.stw.pengutronix.de (metis.whiteo.stw.pengutronix.de [IPv6:2a0a:edc0:2:b01:1d::104]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 508CCC3 for ; Mon, 4 Dec 2023 13:52:31 -0800 (PST) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rAGrT-0008G1-7w; Mon, 04 Dec 2023 22:52:19 +0100 Received: from [2a0a:edc0:0:900:1d::77] (helo=ptz.office.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1rAGrS-00DbUZ-HC; Mon, 04 Dec 2023 22:52:18 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1rAGrS-00ELqD-7q; Mon, 04 Dec 2023 22:52:18 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Corentin Chary , Hans de Goede , =?utf-8?q?Ilpo_J=C3=A4rvinen?= Cc: acpi4asus-user@lists.sourceforge.net, platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, kernel@pengutronix.de Subject: [PATCH 1/2] platform/x86: asus-wmi: Convert to platform remove callback returning void Date: Mon, 4 Dec 2023 22:52:11 +0100 Message-ID: <639b9ffc18422fe59125893bd7909e8a73cffb72.1701726190.git.u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.42.0 In-Reply-To: References: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1959; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=jIzop6S8QxKkWaTxvedKHsOFu3W6F7VXWCpnop+8wrY=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlbkoL0sydLl3CsqUBDkJQ1mi+S2e/Z23m6TTLX v3E4cdsgCqJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZW5KCwAKCRCPgPtYfRL+ TjqfB/4kh62jsY9FemT7I87VAY7bFN6t7GY1EikVZJFTSZxX063lpzsyuN8EmokNVzkE/FkGeEd O3cif3ZSrPtT55AW+dDr6F3YQ4fccAk/DmnLvRD44ShiEz3u4wXdTYi1VVSt5OQbg18aC2SPV2w UqT80Bc1yXx84/iAzv4K3IyoPSEIZEDv0sBcQYLLFpOj3p1JYzENz/O3o0Nfll5QBnDliOjwIF/ GTNnnft/iDRHJo7OdfB4XjMcsOYOEa7akCIoLdoboNquChiCllV6KJ7yEYu88st+xOpLusT5Kkv IAL7vjKtEGJBm++GGGp/GyNQ0/OBDO9WqGFwzh/mfpW0XN1H 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.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Mon, 04 Dec 2023 13:52:35 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784389839146803751 X-GMAIL-MSGID: 1784389839146803751 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 ignored (apart from emitting a warning) 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. Eventually after all drivers are converted, .remove_new() will be renamed to .remove(). 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/asus-wmi.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c index ca668cf04020..d1ec40e4881d 100644 --- a/drivers/platform/x86/asus-wmi.c +++ b/drivers/platform/x86/asus-wmi.c @@ -4604,7 +4604,7 @@ static int asus_wmi_add(struct platform_device *pdev) return err; } -static int asus_wmi_remove(struct platform_device *device) +static void asus_wmi_remove(struct platform_device *device) { struct asus_wmi *asus; @@ -4627,7 +4627,6 @@ static int asus_wmi_remove(struct platform_device *device) platform_profile_remove(); kfree(asus); - return 0; } /* Platform driver - hibernate/resume callbacks *******************************/ @@ -4749,7 +4748,7 @@ int __init_or_module asus_wmi_register_driver(struct asus_wmi_driver *driver) return -EBUSY; platform_driver = &driver->platform_driver; - platform_driver->remove = asus_wmi_remove; + platform_driver->remove_new = asus_wmi_remove; platform_driver->driver.owner = driver->owner; platform_driver->driver.name = driver->name; platform_driver->driver.pm = &asus_pm_ops; From patchwork Mon Dec 4 21:52:12 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: 173571 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp3060264vqy; Mon, 4 Dec 2023 13:52:38 -0800 (PST) X-Google-Smtp-Source: AGHT+IEs/tw6VDMZYS39AwFiXuhWplU51KpX6VSQacMBzesznIC48SOV+m640EfUDFdY53ULXOLS X-Received: by 2002:a05:6358:5284:b0:16b:f6c6:b8aa with SMTP id g4-20020a056358528400b0016bf6c6b8aamr4885732rwa.1.1701726757692; Mon, 04 Dec 2023 13:52:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701726757; cv=none; d=google.com; s=arc-20160816; b=DTYSbNwNw8i5VvleHB3IyLO29beM2reyJd6j0Zghel+q+Di1lHNiTZuYVQnanjU2ja NQsO0dNo7p9JLlXSOcJGSJtNE1otbiV5zHaKTRhYxMzaBgH1fgvab+cHB9oMHpylJhFF re6UwAbFYhS3nmLw1Y+w0Hl+lWkuHNFWfYqoNPqwg8t98wzqSq8ROJXMrILHHI1yvoIP AerSJuG8wqAFYxT3Uk0AYMEaH1uOF5dG3WhT+AWmwlgiX0LT5ZZC7/ENNuGBD2lgESuu Xc0Pa8fzSYlIrgV+XxwjKOc3tbFM8y1x/R71jRDLf2zPeuFmImWiQbf9cEMEneSdtbAQ +YmA== 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=JGljtPkNZHDD9MG3aDj0tZVJfPjSYHDS74cTx6LyT5M=; fh=KeVA7YkUQxrf+qBVJkwZkizymcq5Z7o0Of0gki38zcY=; b=FwTXgtcNjSQLICnBJpXQxSSY8qnDUF6LiI2HF0E79nKNaGjhRpI2ILSvYPypTLtXYz uRlMYIAh+SNsBjAPt0spPL+1dlmxsRc/qWZiJn/Q0hSMZLo/6x9n7IPmaNT8E+hOOrcu 5kIabbJkXUii49d+wbSfTSFi1h9OPrlmcOxOwsTQuSGZAaZ4fAbCixzW/uho0ygMZr2w 4qiZdMXx9Abr1lP87vfO1wFBcsrEqkDcGlUq2ZgW/t0iZHErIipM0FiSiSW3N/EKZ+Da jVmyWwG15+KoqOXL9futakqQ+MM/EsO3bp+/p3mLRkpphbWf6Bi0A9VOaI5UhbCrumcf TH5A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id 29-20020a63185d000000b00563de199314si8576263pgy.896.2023.12.04.13.52.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Dec 2023 13:52:37 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id CA90580ADF0F; Mon, 4 Dec 2023 13:52:32 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230146AbjLDVwY (ORCPT + 99 others); Mon, 4 Dec 2023 16:52:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34712 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229556AbjLDVwX (ORCPT ); Mon, 4 Dec 2023 16:52:23 -0500 Received: from metis.whiteo.stw.pengutronix.de (metis.whiteo.stw.pengutronix.de [IPv6:2a0a:edc0:2:b01:1d::104]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A389CC3 for ; Mon, 4 Dec 2023 13:52:29 -0800 (PST) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rAGrU-0008G2-Am; Mon, 04 Dec 2023 22:52:20 +0100 Received: from [2a0a:edc0:0:900:1d::77] (helo=ptz.office.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1rAGrS-00DbUc-P8; Mon, 04 Dec 2023 22:52:18 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1rAGrS-00ELqH-Fk; Mon, 04 Dec 2023 22:52:18 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Hans de Goede , =?utf-8?q?Ilpo_J=C3=A4rvinen?= , Rishit Bansal , Mario Limonciello , Jonathan Singer , Krzysztof Kozlowski , SungHwan Jung Cc: platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org, kernel@pengutronix.de Subject: [PATCH 2/2] platform/x86: hp-wmi: Convert to platform remove callback returning void Date: Mon, 4 Dec 2023 22:52:12 +0100 Message-ID: X-Mailer: git-send-email 2.42.0 In-Reply-To: References: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1879; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=6eVY8z/A3k8fCdRzyiRfKam1KZi6FiUt4SL/1W+RYfE=; b=owGbwMvMwMXY3/A7olbonx/jabUkhtQ8L54FRRnJjzdwfLuv90P4yt36Z5ev7oqZPO38yvKHp a29FkGGnYzGLAyMXAyyYoos9o1rMq2q5CI71/67DDOIlQlkCgMXpwBM5IcLB0NrRdP84FjmFfP9 3dwkC7ce0yyu2D7dMObw01tr/LK/RXQsNjHkYZg14fr1d/0fyw7vya5baBW+4cjKqgaLPUv5ghg 8Qz5ODDj09sK8wq857LXBi1b8mMU2LSug68M+B+sO+Ynek4RUrmdw3/207f2aSxtvZu6T5dmpd6 tBk8c2/WvoTy/7b2slexefNg/cXlPmvip2smafxtHrX3bo5wXXclRFnXFj1tn6XX6WvYpI7rJsr tf7lKL1VBkywn9qi7EXrtN68nxTE39N5BkLY7Ufbc6pbBGyUzpi7N5pui1zSHgsYuKozK6jky05 ofZZ2u5DV/3/pGY1iAkzJAWd+8+7OZfJe3PjVGvLl53HAQ== 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.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_LOW, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 04 Dec 2023 13:52:32 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784389836527023421 X-GMAIL-MSGID: 1784389836527023421 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 ignored (apart from emitting a warning) 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. Eventually after all drivers are converted, .remove_new() will be renamed to .remove(). 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/hp/hp-wmi.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/platform/x86/hp/hp-wmi.c b/drivers/platform/x86/hp/hp-wmi.c index 8ebb7be52ee7..e536604225c5 100644 --- a/drivers/platform/x86/hp/hp-wmi.c +++ b/drivers/platform/x86/hp/hp-wmi.c @@ -1478,7 +1478,7 @@ static int __init hp_wmi_bios_setup(struct platform_device *device) return 0; } -static int __exit hp_wmi_bios_remove(struct platform_device *device) +static void __exit hp_wmi_bios_remove(struct platform_device *device) { int i; @@ -1502,8 +1502,6 @@ static int __exit hp_wmi_bios_remove(struct platform_device *device) if (platform_profile_support) platform_profile_remove(); - - return 0; } static int hp_wmi_resume_handler(struct device *device) @@ -1560,7 +1558,7 @@ static struct platform_driver hp_wmi_driver __refdata = { .pm = &hp_wmi_pm_ops, .dev_groups = hp_wmi_groups, }, - .remove = __exit_p(hp_wmi_bios_remove), + .remove_new = __exit_p(hp_wmi_bios_remove), }; static umode_t hp_wmi_hwmon_is_visible(const void *data,