From patchwork Fri Dec 8 16:08:10 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: 175886 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp5555531vqy; Fri, 8 Dec 2023 08:09:32 -0800 (PST) X-Google-Smtp-Source: AGHT+IHmzCxT0yyyIPzTviKBn4b7OhiuEa8kZtxSR2DWVRQeh4nblGCA3S0Pjj9CgYar/svEBix4 X-Received: by 2002:a17:90a:5787:b0:286:742e:47b8 with SMTP id g7-20020a17090a578700b00286742e47b8mr309363pji.3.1702051772122; Fri, 08 Dec 2023 08:09:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702051772; cv=none; d=google.com; s=arc-20160816; b=Nt0NGzB5D+DsGleYJf3KvUB8E6x5cq9yldcXQ/fTcDNlI7Pr6BdzXaA9zw6JbEn8R0 QAkp/XxrPmLUlc5XHW82himBIU19X2nLlnOux1RxTeVaro7FcKZGQv8mvsHmyF7k4kRL jxesZCZBKrpnzYySQ8FmhtFLCk07AMu1N7SNUZmjIyg3nLNQhZCYEJ9Ls/zmh8L+MZtQ Zs+yOgzfVAkKp4bmgcuQ/BGoUVavTlYcv2iuxOdeHhZt2vQR62GJf36jB4jKWEIdZo/L 9XYLBECLZQNeoRagl/f8culPVcvvinUceZx/QD/LmwAUb1/umiRDLUb9UsYHyllLCGN8 H6+g== 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=yurDGX0DjdPih6MLCGHWQz13shJi0UKpAx5ts8YSl50=; fh=eFkhKPH8o6TfDQ+LVr0RN6ysuBCZ25gGxWY1BHAsAuk=; b=egFs53j9i8MOXDyrSARvvJ9sfhPGwmgOM46hdhBqj7Gn26NBJ0fj3/UbY3lrX2sJzK Exjdt0f3UbuQxzrrIQ09GF/nFYxS7anQUYnARSFBpBKnQGDN8V/qCGBUFUmxXeh6upBb Es9N7N3v0MRRNzCWMJmSeLLoFfL8elrk7uXhHc3MVoqSPVGFdLok9YIidoZlIZhNLJQu qqjxuloi5OgEUgKSI7ojhSUVkXoL+hpKRVuA6syo36/aA+NNIZsVjmf9OTit5jizMD+f EPAYxD4/1bdv0emr7lgeU85aU6gtJWWUXSi81L07KlMFFejsdmCc3frYo0esgnhanADE zLpA== 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:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id bj20-20020a17090b089400b002866c761c77si3150575pjb.176.2023.12.08.08.09.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Dec 2023 08:09:32 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (Postfix) with ESMTP id 68CE8813550A; Fri, 8 Dec 2023 08:09:28 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233632AbjLHQJT (ORCPT + 99 others); Fri, 8 Dec 2023 11:09:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60318 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233534AbjLHQJN (ORCPT ); Fri, 8 Dec 2023 11:09:13 -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 86FC01989 for ; Fri, 8 Dec 2023 08:09:19 -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 1rBdPd-000089-Hm; Fri, 08 Dec 2023 17:09:13 +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 1rBdPd-00ES0S-0V; Fri, 08 Dec 2023 17:09:13 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1rBdPc-00GUaS-NR; Fri, 08 Dec 2023 17:09:12 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Dominik Brodowski , Greg Kroah-Hartman Cc: Daniel Mack , Haojian Zhuang , Robert Jarzmik , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel@pengutronix.de Subject: [PATCH 5/7] pcmcia: pxa2xx: Convert to platform remove callback returning void Date: Fri, 8 Dec 2023 17:08:10 +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=1870; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=hvn8AQUIqYIyVFAM+ew2t9GzPmRIrB2d2DyEy1ujsww=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlcz90RZC/CPits6AxPT2VDwenom4vwo7b3Ux8k UrtlvzSI3mJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZXM/dAAKCRCPgPtYfRL+ TkgxB/450LmDHFEQA6eZw+c0u/hHlMa4ZxsV6qeu5sZ0RIGGDgGGcneuz5ggq9a/A6ZpkmhZpcF wKnySPUZ9buT+h0XS0JLrrCAFjxJ/4aKbzB0E4Fr3SmWAZnojZ7chE5T/L3T/BbjmhubSW+HJ6t mb2cIVMPWCId+J0dBsKVo/uoEMztSyQ50zM/Hwl7YtsvUWvyItEAD+5ZNhxMEYfa5HfhOsEgsPA qsbOMmufsdyvb+2t60AZWVeaiMPyHQ8ZL/ndgTJ8WUN75zE+8DRo4JoS8S209V4GTKC3aVBIYP0 AiMynIskF3X1hPg7u6pgQ9o39vBrvV1xc5onmzK7dMHFRt6n 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=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.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 (agentk.vger.email [0.0.0.0]); Fri, 08 Dec 2023 08:09:28 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784730638822817608 X-GMAIL-MSGID: 1784730638822817608 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/pcmcia/pxa2xx_base.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/pcmcia/pxa2xx_base.c b/drivers/pcmcia/pxa2xx_base.c index 5254028354f4..457fb81b497a 100644 --- a/drivers/pcmcia/pxa2xx_base.c +++ b/drivers/pcmcia/pxa2xx_base.c @@ -313,15 +313,13 @@ static int pxa2xx_drv_pcmcia_probe(struct platform_device *dev) return ret; } -static int pxa2xx_drv_pcmcia_remove(struct platform_device *dev) +static void pxa2xx_drv_pcmcia_remove(struct platform_device *dev) { struct skt_dev_info *sinfo = platform_get_drvdata(dev); int i; for (i = 0; i < sinfo->nskt; i++) soc_pcmcia_remove_one(&sinfo->skt[i]); - - return 0; } static int pxa2xx_drv_pcmcia_resume(struct device *dev) @@ -338,7 +336,7 @@ static const struct dev_pm_ops pxa2xx_drv_pcmcia_pm_ops = { static struct platform_driver pxa2xx_pcmcia_driver = { .probe = pxa2xx_drv_pcmcia_probe, - .remove = pxa2xx_drv_pcmcia_remove, + .remove_new = pxa2xx_drv_pcmcia_remove, .driver = { .name = "pxa2xx-pcmcia", .pm = &pxa2xx_drv_pcmcia_pm_ops,