From patchwork Fri Mar 8 08:51:10 2024 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: 13586580 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B144CC54E4A for ; Fri, 8 Mar 2024 08:52:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=8afDpP0HgU+QoKrbkgGeHn6wG11UvrSMmtdqDvD8gPI=; b=4PIWhHwXqwgh+J V3l8gBPkRYYnDC3D+s8EAx1Q68MbgSDaAI2ojxE5KLsYNTd28qWAzjlS+sz51imG7jqnE0cwvePQj Az88eAWIfoT3JERKujMdKHPEROfpJNwXcpHc1FhpRwTBNd1zMCPjsixSrjpCnmbXgmfkZEnLsT9AH KjytZBf77bjqr1zDpo59YmVRwYGHQqoNHI5qF0ShfVMec6Z7XrMP+UNOx6K21rwXuywAN9tV5fVvP LiS8rWYsDkk0Zfy/goRdkVfzNhp4szBydFWfp2yIW1xAyQjSt4avhuF2yXAQ+VPO2oBKd/J9g8SGe 5XXGTgNDSxgIyuKYDvgg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1riVxb-00000008Qdf-00D7; Fri, 08 Mar 2024 08:52:11 +0000 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1riVxX-00000008QbG-3TeM for linux-arm-kernel@lists.infradead.org; Fri, 08 Mar 2024 08:52:09 +0000 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 1riVxH-0006wD-Dh; Fri, 08 Mar 2024 09:51:51 +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 1riVxF-0056NH-LB; Fri, 08 Mar 2024 09:51:49 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1riVxF-00245h-1p; Fri, 08 Mar 2024 09:51:49 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Hector Martin , Sven Peter , Keith Busch , Jens Axboe , Christoph Hellwig , Sagi Grimberg Cc: Alyssa Rosenzweig , asahi@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-nvme@lists.infradead.org, kernel@pengutronix.de Subject: [PATCH] nvme-apple: Convert to platform remove callback returning void Date: Fri, 8 Mar 2024 09:51:10 +0100 Message-ID: X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1926; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=7IY/EZDqLP3gMUE/l+/yAAJeCn0pnD9Wioy9NyED6Lg=; b=owGbwMvMwMXY3/A7olbonx/jabUkhtRXFxuNnWMqXT9anH93aYpN+jqX35sXCL215MhIvVXhx hz7zpq1k9GYhYGRi0FWTJHFvnFNplWVXGTn2n+XYQaxMoFMYeDiFICJKBVzMDRUezX4rGy54M6x KzDjVXJC4vSFNc6rG8L/iohPVPgZquzBtq554Zt1PoLF/JGyfbKZG542LBJdmq9lMXtV8Ef9Zam 2gc0um6dIdX7eZOQ1JbGqN9ZgfcyUb/c+cXr8b3JRLWUs/X7VTG2OpJ37jnnW6ZcUmxLnaF+LNZ Ksmpi8nPFXTsbsRS+Yojxby/SuLrjJ+eRU8THX7I3axmuk+5mXXrMNPnTnanPQ1v4/96O9pJlue R6L5sx+FvN31wqZh59ZqoMttBYd5Ell+HLqYPvs/RYdVw9LJj955RF4ZFOayHoVufpwsR1dm3Mi WbbMCC1gPTnzYIV/z2uHyzVWeXnBThc4dmwMShdboGsPAA== 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-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240308_005207_894640_26C2BC6E X-CRM114-Status: GOOD ( 16.72 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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/nvme/host/apple.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) base-commit: 8ffc8b1bbd505e27e2c8439d326b6059c906c9dd diff --git a/drivers/nvme/host/apple.c b/drivers/nvme/host/apple.c index a480cdeac288..dd6ec0865141 100644 --- a/drivers/nvme/host/apple.c +++ b/drivers/nvme/host/apple.c @@ -1532,7 +1532,7 @@ static int apple_nvme_probe(struct platform_device *pdev) return ret; } -static int apple_nvme_remove(struct platform_device *pdev) +static void apple_nvme_remove(struct platform_device *pdev) { struct apple_nvme *anv = platform_get_drvdata(pdev); @@ -1547,8 +1547,6 @@ static int apple_nvme_remove(struct platform_device *pdev) apple_rtkit_shutdown(anv->rtk); apple_nvme_detach_genpd(anv); - - return 0; } static void apple_nvme_shutdown(struct platform_device *pdev) @@ -1598,7 +1596,7 @@ static struct platform_driver apple_nvme_driver = { .pm = pm_sleep_ptr(&apple_nvme_pm_ops), }, .probe = apple_nvme_probe, - .remove = apple_nvme_remove, + .remove_new = apple_nvme_remove, .shutdown = apple_nvme_shutdown, }; module_platform_driver(apple_nvme_driver);