Received: by 2002:ad5:4acb:0:0:0:0:0 with SMTP id n11csp983438imw; Thu, 14 Jul 2022 14:50:52 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tw0XBZfwBHHI2kgXCFbiaqi/NorO5nyKqG+JO7TY1QybF4RaSzwgUXh5UDBhWh7Ukm7M5W X-Received: by 2002:aa7:c0c7:0:b0:43a:79b9:5cd1 with SMTP id j7-20020aa7c0c7000000b0043a79b95cd1mr14485667edp.282.1657835451971; Thu, 14 Jul 2022 14:50:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657835451; cv=none; d=google.com; s=arc-20160816; b=BkMTtZ2XSzgQC0p9uF7mwR/Iq71y2aw+LCrpMxJf8+/et0n0NG/iB6jnGI2Sx70nt8 AQbpHk0HjqpGCpsWUML9uQjxm1+BouZlCK5qfNYtamj6z8pYsOwjltHSrqzHasGVeMmD j+u0lA2dgP/QkYR8OXPnlEZC4C+henA+rwxirvMzeHVN3f53m+mIiFaMtPeHeI0IUUn0 pu30NvsXobeZLnZ5mCguaQO4rzO7ekN7Oc1Wm+1QghPjThImhv1pCpPYxUxMMxakEqN2 Md7TiAJO2c15n1sMEEHfXZ+uYmIZLUUBuB1DWsUiL8J0j12CJIzobw2IZmCUDgJWnZBO QVbg== 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 :message-id:date:subject:cc:to:from; bh=DFvi+B3mgA1tri2s1h+jQk2o4ZkY4hrc3Mgbn7fmAOQ=; b=c+ynev7QwHp+I8IPn68jf24aJ/zBWjqQLOl6fsRaOVq124y9BwwGcRjMLWR1LbpSLu I8bE7cDhvNYsd7+Rm1o+EN0ankHzF6+BG40h7tUPatzv13pGHklRCpyI/M3iKgzzKewV 7WlBDoeHjazsRprGfCiXJL4pIkNTcf99RmVCt/sq2vbC7RWg81FI2OmTsXnOZRMyrUEZ Lg17Zm6f1RuOx0dpz/8RVRymLf8mE1iiLcef5Yg4qlFH5OL79F/htHmrPCF/CIVvPVcv 2Q4acyuiTzokYYCO3Q00TEYuvBLkyiyZMayauwBQXzsr8AtLFdZywHNTE3cy0V4qWIQ8 5org== 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n5-20020aa7c685000000b0043767ebf185si2153167edq.242.2022.07.14.14.50.04; Thu, 14 Jul 2022 14:50:51 -0700 (PDT) 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 S239842AbiGNVpp (ORCPT + 99 others); Thu, 14 Jul 2022 17:45:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43116 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229984AbiGNVpo (ORCPT ); Thu, 14 Jul 2022 17:45:44 -0400 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 B37216F7C0 for ; Thu, 14 Jul 2022 14:45:43 -0700 (PDT) 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 1oC6eU-0008JV-3X; Thu, 14 Jul 2022 23:45:42 +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 1oC6eT-000zKG-5p; Thu, 14 Jul 2022 23:45:41 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1oC6eS-005Djk-F7; Thu, 14 Jul 2022 23:45:40 +0200 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: Dominik Brodowski Cc: linux-kernel@vger.kernel.org, kernel@pengutronix.de Subject: [PATCH] pcmcia: sa1100: Make sa11x0_drv_pcmcia_legacy_remove() return void Date: Thu, 14 Jul 2022 23:45:34 +0200 Message-Id: <20220714214534.63517-1-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Developer-Signature: v=1; a=openpgp-sha256; l=1617; h=from:subject; bh=/KOsnQwcJQVul4wMzQAkJkQgZTHjXHM4GxuzMgZHL1U=; b=owEBbQGS/pANAwAKAcH8FHityuwJAcsmYgBi0I569TxNv3HYoElZc4+pNv/N2YOMXVuT93gDKAID G4FwQDaJATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCYtCOegAKCRDB/BR4rcrsCRTyCA CgnIgi+VonYXuvbkCdcqh+cyc24vNYs8Q5lIsEQQfymaN6V2G5tk82VmjclsN5LjRkFIRWTfoEOFfP yHUtm2UDzJaJmX1IXYO1zVOeibblusd7KGaO+uDevXb2QU8+hogcWwK4ybFvJVgeNCg1tyfIaHomOe 0vfsO+6vmEe6OULTq+rQBagUF0hvvu3SUIXc8sLQvP+c8K8KvKqB78cibJE3+9toA49/rXE5fCXs0j ozBeO31236HRaLx4som/DnP0rtzmdratSUXT19p3eUyEjSh4ffCWcVMvsS5Z7V3Mxpg/UDnctkZS/3 tq7zAPCdnkhZ0Z/feC0x9Ps6pe8hnl X-Developer-Key: i=u.kleine-koenig@pengutronix.de; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 Content-Transfer-Encoding: 8bit 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,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 lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org sa11x0_drv_pcmcia_legacy_remove() returns zero unconditionally. Letting it return void instead makes it easier to see in the caller that there is no error to handle. This is a preparation for making platform remove callbacks return void. Signed-off-by: Uwe Kleine-König --- drivers/pcmcia/sa1100_generic.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/pcmcia/sa1100_generic.c b/drivers/pcmcia/sa1100_generic.c index 47b060c57418..c2b6e828c2c6 100644 --- a/drivers/pcmcia/sa1100_generic.c +++ b/drivers/pcmcia/sa1100_generic.c @@ -125,7 +125,7 @@ static int sa11x0_drv_pcmcia_legacy_probe(struct platform_device *dev) return ret; } -static int sa11x0_drv_pcmcia_legacy_remove(struct platform_device *dev) +static void sa11x0_drv_pcmcia_legacy_remove(struct platform_device *dev) { struct skt_dev_info *sinfo = platform_get_drvdata(dev); int i; @@ -134,8 +134,6 @@ static int sa11x0_drv_pcmcia_legacy_remove(struct platform_device *dev) for (i = 0; i < sinfo->nskt; i++) soc_pcmcia_remove_one(&sinfo->skt[i]); - - return 0; } static int sa11x0_drv_pcmcia_probe(struct platform_device *pdev) @@ -167,8 +165,10 @@ static int sa11x0_drv_pcmcia_remove(struct platform_device *dev) { struct soc_pcmcia_socket *skt; - if (dev->id == -1) - return sa11x0_drv_pcmcia_legacy_remove(dev); + if (dev->id == -1) { + sa11x0_drv_pcmcia_legacy_remove(dev); + return 0; + } skt = platform_get_drvdata(dev); base-commit: f2906aa863381afb0015a9eb7fefad885d4e5a56 -- 2.36.1