From patchwork Fri Jun 3 21:07:46 2022 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: 12869416 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 A27ACC433EF for ; Fri, 3 Jun 2022 21:11:39 +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:References:In-Reply-To: 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: List-Owner; bh=TG5PLZ5jt68x0dZgT5HJ1UerLtGRJjTLzbMnJ/v/un0=; b=EPV2dLXBbhzAgN iy+xEihCHKBDjmC+zP5N3iizaxK0wgOg1WTJuRDGMDmvrQy3I+WXv76KgSGMmznJLkVESCqGac91y 6bhi7+7JZ5OR6Qn9dW06dHg8xxF3nqc6b1YF2gtOmEp6SGSzsoVq5FobnRw5JY0omz4dHIhmt9qc9 wZANwPNqoLLbhdwH3UZwvizcGksB3yzc6a3TEdp27KkNEms11DbQtHoZokZLGvHrkPzDPQqgPtjmu 7jDZj4eXyiaqYJlvXKKRsNryAI/59IKmvqm62swKeJeOzKgGtC9im3Kz7OBt8JRfwUX1kq3EMc1VK TU1A9pWbN2IL7uRwCqsw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nxEYK-008i1D-0y; Fri, 03 Jun 2022 21:09:53 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nxEWu-008h38-Rl for linux-arm-kernel@lists.infradead.org; Fri, 03 Jun 2022 21:08:26 +0000 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 1nxEWf-0003qn-EN; Fri, 03 Jun 2022 23:08:09 +0200 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 1nxEWb-006Hps-RF; Fri, 03 Jun 2022 23:08:04 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1nxEWZ-00E1HB-In; Fri, 03 Jun 2022 23:08:03 +0200 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Tudor Ambarus , Pratyush Yadav , Miquel Raynal , Richard Weinberger , Vignesh Raghavendra , Joel Stanley Cc: kernel@pengutronix.de, Michael Walle , Andrew Jeffery , linux-mtd@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-aspeed@lists.ozlabs.org Subject: [PATCH 02/14] mtd: spi-nor: aspeed-smc: Make aspeed_smc_unregister() return void Date: Fri, 3 Jun 2022 23:07:46 +0200 Message-Id: <20220603210758.148493-3-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220603210758.148493-1-u.kleine-koenig@pengutronix.de> References: <20220603210758.148493-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1403; i=uwe@kleine-koenig.org; h=from:subject; bh=eWtWx/epQpLlsoTlHHCWvKtyg2OjpSVS7ZvDdS6QM84=; b=owEBbQGS/pANAwAKAcH8FHityuwJAcsmYgBimnfLxu7k0eweeB8bzbAH+71WvKfW1QPZQ8Z1ONZ2 fKNE8veJATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCYpp3ywAKCRDB/BR4rcrsCRl5CA CR6wsaStLWrD1HN5wBjAgJ4orKtfVKq/JMqleHRmO5CwekrODLEi7LLqyUuDLTXqc/pfwOu6mp4a0H 2z4hW0+UDSiJsQFrasKIBTfS6ObBt4Pm6vcUnwyMsTJJ0qDmBazUzsO1k2eSEpoDv1L7Qpp7TbCKqx kNL97YVzqcoJyDJcSzUH72DEPcL6huEQyLW8tepFf0AzAc/VgFrvwj9oKczL9QeCvN84LCkQYO/PjF Pk4UZJKlttaHaCgjUPTC286I7DTmyFNrT/E08O/Z77L9t8orRkRkOEZ13veOxp9Uwcz77Wnj0y5aWQ UcZ9qUZT8TIsYoxgyOUeVWolF5F1Y9 X-Developer-Key: i=uwe@kleine-koenig.org; 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-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220603_140824_944436_7570E0C3 X-CRM114-Status: GOOD ( 14.40 ) 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 function returns zero unconditionally, so simplify to make it obvious there is no error to handle in the callers. This is a preparation for making platform remove callbacks return void. Signed-off-by: Uwe Kleine-König --- drivers/mtd/spi-nor/controllers/aspeed-smc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/mtd/spi-nor/controllers/aspeed-smc.c b/drivers/mtd/spi-nor/controllers/aspeed-smc.c index acfe010f9dd7..bd149104533a 100644 --- a/drivers/mtd/spi-nor/controllers/aspeed-smc.c +++ b/drivers/mtd/spi-nor/controllers/aspeed-smc.c @@ -399,7 +399,7 @@ static ssize_t aspeed_smc_write_user(struct spi_nor *nor, loff_t to, return len; } -static int aspeed_smc_unregister(struct aspeed_smc_controller *controller) +static void aspeed_smc_unregister(struct aspeed_smc_controller *controller) { struct aspeed_smc_chip *chip; int n; @@ -409,13 +409,13 @@ static int aspeed_smc_unregister(struct aspeed_smc_controller *controller) if (chip) mtd_device_unregister(&chip->nor.mtd); } - - return 0; } static int aspeed_smc_remove(struct platform_device *dev) { - return aspeed_smc_unregister(platform_get_drvdata(dev)); + aspeed_smc_unregister(platform_get_drvdata(dev)); + + return 0; } static const struct of_device_id aspeed_smc_matches[] = { From patchwork Fri Jun 3 21:07:52 2022 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: 12869418 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 599C4C43334 for ; Fri, 3 Jun 2022 21:12:54 +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:References:In-Reply-To: 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: List-Owner; bh=F2hupd7olSX/qoOMA4QQZkOLD8UuZE6AMNcwgmtUvYI=; b=mJviDWKNOSQ7mR 04eQErritB1v5MTStYfhizD7ImQyAzrFbEnuIBATIWYutvHO2qIrD+/CDfyfQKfTu76eGEXXRuanT HJLkUDkY3k238+rrFNyDxr3VqIq2lE6khENm3J2Kr8yoVG3ygY5ZCzNN17NgMD3d4r2bUWSbcmU7T r3CzbDNb2aOuHf9Ht5jau5NsT13aFXuJRvRC+Xauq03gYSyn1a8pIAJDf7HuU1In6hcNq7FQYmMiN 9qAuIxw9jHQO8yqlC0aMhzT4WKrtMzZaZZ8TNzngocXLs9NzEiYxGp+HlC9gFtTHGpQiAqmJu3xCt Pmi2mPm8buKApOsH/7eA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nxEZw-008jXH-9P; Fri, 03 Jun 2022 21:11:32 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nxEWx-008h4d-Fx for linux-arm-kernel@lists.infradead.org; Fri, 03 Jun 2022 21:08:28 +0000 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 1nxEWc-0003rK-S9; Fri, 03 Jun 2022 23:08:06 +0200 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 1nxEWd-006HqM-Ey; Fri, 03 Jun 2022 23:08:06 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1nxEWa-00E1HW-Q6; Fri, 03 Jun 2022 23:08:04 +0200 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Tudor Ambarus , Miquel Raynal , Richard Weinberger , Vignesh Raghavendra , Nicolas Ferre , Alexandre Belloni , Claudiu Beznea Cc: kernel@pengutronix.de, linux-mtd@lists.infradead.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 08/14] mtd: rawnand: atmel: Warn about failure to unregister mtd device Date: Fri, 3 Jun 2022 23:07:52 +0200 Message-Id: <20220603210758.148493-9-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220603210758.148493-1-u.kleine-koenig@pengutronix.de> References: <20220603210758.148493-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1323; i=uwe@kleine-koenig.org; h=from:subject; bh=w7t3z1XUI/STdrsUUjD1Zed5MVKtRFjcH07jBAY9g6c=; b=owEBbQGS/pANAwAKAcH8FHityuwJAcsmYgBimnfeF/dYwuJXY8Jg4msHfPQvAz1kd7FIE1gdvMiJ 2sLe5dyJATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCYpp33gAKCRDB/BR4rcrsCR+/B/ 41uPhowocJ6NtP1+EEFqzGIx0uufPzBz2XJqWYskZyDB+XNb1/vTAhlpA+xQOWY/0aKjR2fdlrbe8c aXFy15gE9tOqKlV26tCPqyLsKJ1xmI4SP5ARYbTnjCTJUpiVAdGxsEKcjuy7uqlMjJK1hBWZ86oV2n hn1Fg7M85zV0h/xy0DsaU9EboSMEm2EpfvxykSHxcmkKmCAOj9f85I2c8rjWrjrCBvff44sliN6yoL nEwcANB0oRm9IMvSkDG7IVQt6nENLWP6TEkSfaUP5bWEAQi7A2/jfJuL5Ld8ts7hQTWZD9Bm1bepuS eQLlw5HiKP5/DLd3RyK0cxIVgvzAuX X-Developer-Key: i=uwe@kleine-koenig.org; 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-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220603_140827_561918_A2A235AE X-CRM114-Status: GOOD ( 16.11 ) 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 Linux device core doesn't intend remove callbacks to fail. If an error code is returned the device is removed anyhow. So wail loudly if the atmel specific remove callback fails and return 0 anyhow to suppress the generic (and little helpful) error message by the device core. Also check the remove callback to actually exist before calling it. That might happen if nc->caps->ops points to atmel_nand_controller_ops. This is a preparation for making platform remove callbacks return void. Signed-off-by: Uwe Kleine-König --- drivers/mtd/nand/raw/atmel/nand-controller.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/mtd/nand/raw/atmel/nand-controller.c b/drivers/mtd/nand/raw/atmel/nand-controller.c index 6ef14442c71a..bc6ee694f4e2 100644 --- a/drivers/mtd/nand/raw/atmel/nand-controller.c +++ b/drivers/mtd/nand/raw/atmel/nand-controller.c @@ -2629,7 +2629,10 @@ static int atmel_nand_controller_remove(struct platform_device *pdev) { struct atmel_nand_controller *nc = platform_get_drvdata(pdev); - return nc->caps->ops->remove(nc); + if (nc->caps->ops->remove) + WARN_ON(nc->caps->ops->remove(nc)); + + return 0; } static __maybe_unused int atmel_nand_controller_resume(struct device *dev) From patchwork Fri Jun 3 21:07:55 2022 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: 12869415 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 C2EA8C433EF for ; Fri, 3 Jun 2022 21:10:37 +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:References:In-Reply-To: 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: List-Owner; bh=uFLUi/XkHTm7aeJn/ooZSXmb0qLjZZ0WM/MbMkVNQZw=; b=NTjrMCBhHWaNq0 rz2EyszPWBtGxyc9kQUXlWd00aoG+KbcnHpLp/VLF+Bjr3Pvyo9Cwywh3Nk7uMSo0ZJljnvSIafpY ZWLQCuH5t1natdKl7SYI1uohQr8X+aLLzGjXSBVyaPk1PHPJiKrB2udtV3vKnpALFdKpFBnSJXm7Y 3wbmCOLmAvt5oO5VLb+kmKcdFCInM2l/7A4sGVA1NgqteF02dSp82GkA4kEbkhAdj2FOEw67OLsf4 kjxCTybwJSkztTWKTp918dg2bV52DpbQyCOh3w1SjrYCkqdjjs4m7qTVNIXLQ+jL1DcJpGpsY4pjc EUdtCvtstiTFRCrl/f5Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nxEX7-008hAO-JX; Fri, 03 Jun 2022 21:08:37 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nxEWn-008gyo-IS for linux-arm-kernel@lists.infradead.org; Fri, 03 Jun 2022 21:08:20 +0000 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 1nxEWe-0003rQ-M1; Fri, 03 Jun 2022 23:08:08 +0200 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 1nxEWd-006HqT-NF; Fri, 03 Jun 2022 23:08:06 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1nxEWb-00E1Hi-D0; Fri, 03 Jun 2022 23:08:05 +0200 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Liang Yang , Miquel Raynal , Richard Weinberger , Vignesh Raghavendra , Neil Armstrong , Kevin Hilman Cc: kernel@pengutronix.de, Jerome Brunet , Martin Blumenstingl , linux-mtd@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org Subject: [PATCH 11/14] mtd: rawnand: meson: Don't skip cleanup after mtd_device_unregister() failed Date: Fri, 3 Jun 2022 23:07:55 +0200 Message-Id: <20220603210758.148493-12-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220603210758.148493-1-u.kleine-koenig@pengutronix.de> References: <20220603210758.148493-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2079; i=uwe@kleine-koenig.org; h=from:subject; bh=RARxTiaUJYu4OZ6zHphWegS1/d3oBvCOapegjJ7Xz2w=; b=owEBbQGS/pANAwAKAcH8FHityuwJAcsmYgBimnfok3XZnM8xPmeh6eqHGnVxhDUlHH6mjDHSnMtj XzhjYlWJATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCYpp36AAKCRDB/BR4rcrsCR0fB/ 0XtpF397Uz0TI5bccMu6LPI+SY3xLErkAzy0oq/qVB0J5MexcIdYbctHySiybN1IFKvlbgrQ5cupk6 /iaHpfoOmhZNe4gKrjbocltz+mXgT3dn9PpT6NpXq9cuu/BgQ1ie0+ePFymUHBOKmEevSFLL681zvk cMvB5sdiQwojrFzUNQPK2rU/Paveuencs0tKWbOUSX74Gw+QcDtMJQUT67ZQCVuFCZ9+RWrYcWdcl7 J0cg9UgAZ/S/DWHHzIjABKtzbEZ0dp6906yCsINCp+wRhPu0EPRWBZQRpJIuSWw+qR7RVpml+lVjKh gor07c5W15prWMTew+AfkLn/qAwXj7 X-Developer-Key: i=uwe@kleine-koenig.org; 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-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220603_140817_640138_7599BE2A X-CRM114-Status: GOOD ( 15.09 ) 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 If mtd_device_unregister() fails (which it doesn't when used correctly), the resources bound by the nand chip should be freed anyhow as returning an error value doesn't prevent the device getting unbound. Instead use WARN_ON on the return value similar to how other drivers do it. Then meson_nfc_nand_chip_cleanup() returns 0 unconditionally and can be changed to return void which allows further simplification in the remove callback. This is a preparation for making platform remove callbacks return void. Signed-off-by: Uwe Kleine-König --- drivers/mtd/nand/raw/meson_nand.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/drivers/mtd/nand/raw/meson_nand.c b/drivers/mtd/nand/raw/meson_nand.c index ac3be92872d0..748e115b0bb7 100644 --- a/drivers/mtd/nand/raw/meson_nand.c +++ b/drivers/mtd/nand/raw/meson_nand.c @@ -1293,26 +1293,21 @@ meson_nfc_nand_chip_init(struct device *dev, return 0; } -static int meson_nfc_nand_chip_cleanup(struct meson_nfc *nfc) +static void meson_nfc_nand_chip_cleanup(struct meson_nfc *nfc) { struct meson_nfc_nand_chip *meson_chip; struct mtd_info *mtd; - int ret; while (!list_empty(&nfc->chips)) { meson_chip = list_first_entry(&nfc->chips, struct meson_nfc_nand_chip, node); mtd = nand_to_mtd(&meson_chip->nand); - ret = mtd_device_unregister(mtd); - if (ret) - return ret; + WARN_ON(mtd_device_unregister(mtd)); meson_nfc_free_buffer(&meson_chip->nand); nand_cleanup(&meson_chip->nand); list_del(&meson_chip->node); } - - return 0; } static int meson_nfc_nand_chips_init(struct device *dev, @@ -1445,11 +1440,8 @@ static int meson_nfc_probe(struct platform_device *pdev) static int meson_nfc_remove(struct platform_device *pdev) { struct meson_nfc *nfc = platform_get_drvdata(pdev); - int ret; - ret = meson_nfc_nand_chip_cleanup(nfc); - if (ret) - return ret; + meson_nfc_nand_chip_cleanup(nfc); meson_nfc_disable_clk(nfc); From patchwork Fri Jun 3 21:07:56 2022 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: 12869414 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 D2123C43334 for ; Fri, 3 Jun 2022 21:10:37 +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:References:In-Reply-To: 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: List-Owner; bh=M4uOg2iyti0z5xk1868DC6nNPv9hrwsVktpK1ZVRQ0w=; b=adNGsTiB+Q9q2b V+5EugW7qFGklp2+dujng7eVFFaiKN/7IcX/dfE3LVu3HY0vrdxjpBQ5ftHjMoqy2V9ikJj3wn4o5 glio0jug+MhfJk1nEWgTc7ZQ4yAEQEFrivlETqKDNjXg/Bk6jDn/M4/vf3sLrKqeJPsqPbV7rI7Dz vWZ2ZqgBkWDcs2taaK+xoQWBVPdlNXVUUvK/Cd5j+9i++kUAo/XHAA57h6YZvKiD0dQR6okcquDZs tVE2Vu5v9IpGyuHBMs2uTbfmo53jLpFGSCdI/37yjSWZ1kJFtm5hrr81a387IWGm9S/Cw5tuh8Ea+ JJ0F5WrOfEuZ23y4cWRQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nxEXX-008hUx-Dc; Fri, 03 Jun 2022 21:09:03 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nxEWn-008gyp-Jo for linux-arm-kernel@lists.infradead.org; Fri, 03 Jun 2022 21:08:20 +0000 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 1nxEWe-0003rb-M0; Fri, 03 Jun 2022 23:08:08 +0200 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 1nxEWd-006HqY-TE; Fri, 03 Jun 2022 23:08:06 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1nxEWb-00E1Hl-Iw; Fri, 03 Jun 2022 23:08:05 +0200 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Liang Yang , Miquel Raynal , Richard Weinberger , Vignesh Raghavendra , Neil Armstrong , Kevin Hilman Cc: kernel@pengutronix.de, Jerome Brunet , Martin Blumenstingl , linux-mtd@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org Subject: [PATCH 12/14] mtd: rawnand: meson: Drop cleaning platform data in .remove() Date: Fri, 3 Jun 2022 23:07:56 +0200 Message-Id: <20220603210758.148493-13-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220603210758.148493-1-u.kleine-koenig@pengutronix.de> References: <20220603210758.148493-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=643; i=uwe@kleine-koenig.org; h=from:subject; bh=QI3xNybBVzTrq5z+h5wqtr2aUkInAgi2QgwCgBOyH0A=; b=owEBbQGS/pANAwAKAcH8FHityuwJAcsmYgBimnfr83/o7FfahL01ZrKFGzLyTxREIUALxhkKpbDA hgwbbyeJATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCYpp36wAKCRDB/BR4rcrsCcbtB/ 9tzRUJL7X+1CFqZr6hYdcWjFD4JcWnW0JkP7qh1eH+8w6aAFzxupJ1CLztI0A1zEZ7k2WWMoVinDk8 jfypWaP96xYn+xhu4BiEfqYNEeLmeuH6C+2ZES8DkVcjhoZphr2qQWaP8smQITC3nCSnoTmxoy3FPL 3ZXlf5qYxmgNbBmcoyNv/Wf6oRoowLSIFsZmmkYOVXl1pSjfj6l/xcsVRYnCjnFtB4PLIyn3+ghTRf Q5vMF60CgV1hcNgfctSJBwAfbojxm975Cfw2nF7B1LGqYeyIb2RQ811lIP4zGgqX8m4J7YBNkXMKzG h/uvhx4uFPaGJWzrUaQYE1+w1bvecs X-Developer-Key: i=uwe@kleine-koenig.org; 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-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220603_140817_673274_500A8569 X-CRM114-Status: GOOD ( 11.14 ) 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 driver core cares for unsetting platform data (see device_unbind_cleanup()) on remove. Signed-off-by: Uwe Kleine-König --- drivers/mtd/nand/raw/meson_nand.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/mtd/nand/raw/meson_nand.c b/drivers/mtd/nand/raw/meson_nand.c index 748e115b0bb7..4e6d1a6a19c7 100644 --- a/drivers/mtd/nand/raw/meson_nand.c +++ b/drivers/mtd/nand/raw/meson_nand.c @@ -1445,8 +1445,6 @@ static int meson_nfc_remove(struct platform_device *pdev) meson_nfc_disable_clk(nfc); - platform_set_drvdata(pdev, NULL); - return 0; }