From patchwork Thu Jul 13 08:07:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?5p2O5oms6Z+s?= X-Patchwork-Id: 119620 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp1668859vqm; Thu, 13 Jul 2023 01:16:01 -0700 (PDT) X-Google-Smtp-Source: APBJJlEL4fqVulBFw3mLmK+vUi/lQxdzs6dzE3hNZD+6HHWl+uAonKglBj+KLw4zYTgBLE/1HHIi X-Received: by 2002:a05:6512:6c6:b0:4fb:821e:2241 with SMTP id u6-20020a05651206c600b004fb821e2241mr807407lff.23.1689236161158; Thu, 13 Jul 2023 01:16:01 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1689236161; cv=pass; d=google.com; s=arc-20160816; b=h6s01F6bali6S0FzFq6lO3Qp7d5ZKUqVnCBbRdt9VloqBtf0T17aTSRPNdJvmkywJK 2vUFYGxWI0G1QamiQ0O2mYAu012d/8kaE9ZcycbNW9P+N5Gdv8M+p4Kh771GigccmNLz vOt2OEgtmsYpW85qGZ7y/V/IFYaZdskVaXEo72hnmzMAlqDGyW5RB2qmvxUDzBXNklj7 fS5jvICh7e8IQ8X5STHWlu1NMiSHDAXRdy2nWV1tfKclm/fde0sy8gT0+omSBaxoZIAR Gn0GuTqOvvphoHxRGAxPU93zjEDUiKBxbkHe49glZX0trAnPc4xnxGMGsPlfFNC1b9on H6RQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:content-transfer-encoding :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=SBCrlQifOoquSJLsuYWbDUS75795nZPusK2Le0rM6UY=; fh=ZYodWTe0KCUO3NR7BtRFAqGMu45kjt7wn2F8buQXmlM=; b=n2zliZYSBEXtgF9UPTq9VZRUfYnPnUpNeafPOTQczID7+xMaNk9Uf5H+5aAa/NmQPu r2nPAUpMX1+K2hBgJUkI0O7sbvNQnzSwwU0XfS0Qs7KXBRarrS9kIbJc0tzM+/snvtdC jIeJJZ3nsAAnTKZqHT4q8gnwwQZ39NsfKkaei/A1er34/6yKptUWd4VcYDW6IUGFV8oa o03Uq5/Xh5lSZsUTNYbp1SwB5Q3xGtpF+OMKZ0duFs75muirDTZWGQ5WSAWVOfw6nhQ9 VrHM/r62pAJtD5KCb331ONfS+G7Jn+2rZsZ+BpiyoDRsL/AGWVqoeg9QI1Bb9nZ/MHLl AEjg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@vivo.com header.s=selector2 header.b="TuxEa/NZ"; arc=pass (i=1 spf=pass spfdomain=vivo.com dkim=pass dkdomain=vivo.com dmarc=pass fromdomain=vivo.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; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=vivo.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b1-20020aa7c901000000b0051de2c4f947si6644025edt.643.2023.07.13.01.15.37; Thu, 13 Jul 2023 01:16:01 -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; dkim=pass header.i=@vivo.com header.s=selector2 header.b="TuxEa/NZ"; arc=pass (i=1 spf=pass spfdomain=vivo.com dkim=pass dkdomain=vivo.com dmarc=pass fromdomain=vivo.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; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=vivo.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234220AbjGMILk (ORCPT + 99 others); Thu, 13 Jul 2023 04:11:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49990 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233963AbjGMIKu (ORCPT ); Thu, 13 Jul 2023 04:10:50 -0400 Received: from APC01-SG2-obe.outbound.protection.outlook.com (mail-sgaapc01on2104.outbound.protection.outlook.com [40.107.215.104]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5F9F73A97; Thu, 13 Jul 2023 01:09:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=O6iPd2aJ8WUMhOKpHwXwrYePic78EHYTVbEATrGsjOyc9OTCSPF6R/RNWA8jO+b6luHuAX7VPRsW6l/P1xwhB6WlDpmEtbgoKY3ckWvaAZMJZyGpHoMFod6BqdLVGn8SH5ReWk/Y1rWSk9BxoCh8A9ZNTy1GOSi0XXSiE0KzZu4VUBAWP/bBX5QAR36eHwMZT92c2zWNBm6dZEIFiqvO3sqIM6RXabs8WFEwDklV1bf6jJe12ZF3Eyy0fOpv5ey8ojdCuhkMOiDbE1f4Af6XXNgx/EZvC+6RdHHxuWejCm5z/44fZUhTnPboSeMSzZejT18Khkn6RdUwmQNGICmkBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=SBCrlQifOoquSJLsuYWbDUS75795nZPusK2Le0rM6UY=; b=Efo0nHwvrmDFTHOm3bZzjXSHmFZKEfMgtpM3yH4g3aJVc4Z5B6xvy+Cb49iJlOPxOuIjd4g9/IwIwnQEC0EzSBWsHtmij21hCfvJbBDqMB/VSul6ZmOvYikJoK6pUGUZ5HEDAFqkHSH1GTKvhSI32wZxuYVjIjfxoGsgmOU0u3PucApwVxRd4W1Y7qJRAqocZgt6ZBsIn/mPOU5LUyIZzwglg44gq+AXVn6A8o7bGqcAZatUt53jUmJTTNwFogXD+uMoTwEvo4IiavWD3bpm0NqIZS0JpBkSJ5kitx5txLMIUYuUKTbPrEvZEkh25i09HZAmAur1LObgC/XfP130hA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vivo.com; dmarc=pass action=none header.from=vivo.com; dkim=pass header.d=vivo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vivo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=SBCrlQifOoquSJLsuYWbDUS75795nZPusK2Le0rM6UY=; b=TuxEa/NZJ1l4T3XaxXFLvd8N3EjKjm983TQ+c+d6YEbok4HvGJvF/oZyz0Kp0vDtQQzPHVxuVUlOIVis9A4rbDkDCyYucoVMzF3vTdVD5X8On+ogaUsePjAu1oOyqwYtWGVw/XBbentvpTVlEZhsQqvSCtAGXdrufvVdeynu6FBsfuxVtGJAS4bsbwLgXKYNmSADQgSsvQHVFUD8YdeGzEUbR5P1SnA49Y+8sSqcLw2oldQXSYESoKyKSTwN7TGAdnfFReOD8SsCk3CvjfzcbJUXrinjnYbY9BrFn8mrEErQEx4WOCE7+Liy4p2DcfvHqNXJWeAbI5RK2QlHWx2Jyg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vivo.com; Received: from SEZPR06MB5269.apcprd06.prod.outlook.com (2603:1096:101:78::6) by KL1PR0601MB4371.apcprd06.prod.outlook.com (2603:1096:820:74::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6588.22; Thu, 13 Jul 2023 08:08:47 +0000 Received: from SEZPR06MB5269.apcprd06.prod.outlook.com ([fe80::fa0e:6c06:7474:285c]) by SEZPR06MB5269.apcprd06.prod.outlook.com ([fe80::fa0e:6c06:7474:285c%5]) with mapi id 15.20.6565.028; Thu, 13 Jul 2023 08:08:47 +0000 From: Yangtao Li To: Ulf Hansson Cc: Yangtao Li , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 16/58] mmc: rtsx_pci: Convert to platform remove callback returning void Date: Thu, 13 Jul 2023 16:07:25 +0800 Message-Id: <20230713080807.69999-16-frank.li@vivo.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230713080807.69999-1-frank.li@vivo.com> References: <20230713080807.69999-1-frank.li@vivo.com> X-ClientProxiedBy: SG2PR02CA0091.apcprd02.prod.outlook.com (2603:1096:4:90::31) To SEZPR06MB5269.apcprd06.prod.outlook.com (2603:1096:101:78::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SEZPR06MB5269:EE_|KL1PR0601MB4371:EE_ X-MS-Office365-Filtering-Correlation-Id: 20bfc1ac-4b7f-4cdf-5e3b-08db83786235 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZYYuoWKLDHXftphrOyft+0HkyiS8M9ms5WycNBIslTG0lN3mNdeU7uRdoL3+i2kR4cUFOc7TCQdo+sRB5e89bklhHo+/xn31G8H2yufTAt/bKIFe9QbRGRG1iHIPtDuIPXjUJPMoxU6gixUT/V3zV/C5Yo0DCtI7ezrSHVPlB4vtlOANV2zz9RpyigMg+uT1zavPlGeuEo0H9tp6lvnvnBi0f3hRVWbaJSZGOqLiDDr0BpuUUGvMZ16hdo6WIRxmECgzQCnW3ZTvlz6wmeKJpdR2Qn5v1rZokgF4zGY6DfJoJWta5HPFYFUE0N4A6pVBXAktUDO04hg2/jVutmqYWcUssJHoB0FGRTaCaAsN8ccU7FWwQzStbDDjG60PRbD1STuygBh3q4Yx1+QJcz2QoFcsVTedR6cG6cdIwAXFIZUUmcIEYu9cYc1taEXMDlhJh+R19zM+d0s1kvBrnskvIuECZ0Olya1NgzV5vUdeEJg2fVtHlx2XpbdvXRKc1FNH/1vbuNecnG+MQInOZZOqXvOkwnWgGGZju1XD56u+OV4EE0Dq/Yp4qiptrbnza9KwGR47879+o9v29Rv3UWoloXk1DRNmghv/7ItA4LMwPZy+JQ9y5C73lleXniegMrQxAEls8a/KilnE7zg6qZPbErtTUzpSpSVBaegraiOcMRM= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SEZPR06MB5269.apcprd06.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(4636009)(396003)(136003)(346002)(376002)(39860400002)(366004)(451199021)(38350700002)(38100700002)(478600001)(4326008)(6666004)(86362001)(52116002)(6916009)(6486002)(54906003)(66476007)(66556008)(66946007)(316002)(6512007)(41300700001)(83380400001)(186003)(2616005)(2906002)(36756003)(8936002)(8676002)(26005)(5660300002)(6506007)(1076003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?sirV/0gpkr3dEpoHZLAJ8WK3Axee?= =?utf-8?q?V2qQseNGr2dBQZV8MfLoz1JZuZw42VgOOa9AprV49zDTH7ypANMF9QJcudejM5IxX?= =?utf-8?q?Y73O7gai+zPC+at99NIMGkbVF1bmRn46qes59WwHV2PjKLZl298Kepj/njUZkcEhH?= =?utf-8?q?IUUdrDNCqzBun656/0X5i7H1PWFZc4VYlLMzlURk1GzhwqytOhW6SM/ySWFIOaujM?= =?utf-8?q?lG5psm7Iq08RWiOnm4eIboan5IRpIUmXyHXcw35tUcT5mlEG1v+op+90uGvF8G3rX?= =?utf-8?q?1pyzdycrCHeA4PuVikIrb1ZR7TghwmSvZupW4Z2GYGOkjFuks+uGT6lxCjmUoMQ4Q?= =?utf-8?q?eReAZluMXkc6vxJ7ZKngvag9bZij5EYjPoznlmYp/GnGpa+bNNXJgGjLxI8oh13qC?= =?utf-8?q?zgCzr0U9aRvl61sDGohPSd/uAx/mQr0ndpneu6/iS0a5wSPK8OdOjLYdCVY49LAOs?= =?utf-8?q?aVInqTdN1QJ6IlD3TfLTLrL+cyXs6KkE4h6/NljzcKnmMwEpVdnFbLlyNqy7kVR13?= =?utf-8?q?1les/3egiebfPnYsBgQNEez7Qai0iyiYlgahkUgxiXZWP+yI4+fIeRcd8SNIfFh4E?= =?utf-8?q?b5auGGqvLCNS+vBPHb0RVRt6sgnZ/z7l3zLdF/dnvPrC3v5k/V/gNZhEAXEK+DSrQ?= =?utf-8?q?EIwgHCDy9O+f24wuHgokZ7x+NzWua8c4S2nM2nivoCRb1NLOPf7X067Jt6lPrxAye?= =?utf-8?q?Hdip+m3ztssqCS+y+DmOlwGsH3bh5L/rhy+8SAbYmCdJxPzJvpXcbmIPi+0LvxNw4?= =?utf-8?q?HFXC8KuzCL5nLEjEbmHvdLacXNoaY2bhNGwklqjG/OND6xdd8CE9SIUzL4qQ/Oxq1?= =?utf-8?q?P5yI9hp3wx+4TojuLfHxq+l2SiXZudNgWgSd4SPQ6mr0SpATuIyDsIhtV1pGif7Nt?= =?utf-8?q?KY7y9QTkobWjERYMXtwCBFP2C6oPaNRcAODdQ9WIolq8QsKNd2tXs/JrRG78hZOFc?= =?utf-8?q?XUX69JZicbHZNpPtEO78XdHr1naAp8ljCjnckkr+Gda30bF5dN5DY2tqw9UaCfmt0?= =?utf-8?q?YgBkgebE6zohf+6G3IqQemg60T0wtDTVlXhBjOMxMmVlK4CxviDFHI+ocV1X12o52?= =?utf-8?q?ZWTz+Sne48+AK2SPHaeC2CabznyIQmYzLZMT3AttWg1vLGWBHq48qoUbuvn19ym3j?= =?utf-8?q?a6nyanOVH+fe2w3/VMph0riDn6R+GY8iCd5UcxQHj+6FLJZDACRFO7yK8RVqeJ0Pb?= =?utf-8?q?SXbXmirZy8gjZ8+HPNjg2kfjlA9ImjhVb74CLYW5PfEtf7i8ajbShusz5DQxksQsX?= =?utf-8?q?bk5g7IxAUOgNTOqzuuyWniyw1jtJyUDcvwgjvAbDWtz748vVZvqO46Nd6yiXUdIBS?= =?utf-8?q?12piT8KYv1+9CqS/gSBp2NLP4fkHC1B1wXp3o6T6RtqzkPhF0RRhgbkDiUwQEjsP2?= =?utf-8?q?QQl7gQUadHn+d3IwKqEmA6OqJn2RVtxZJHgDZkBu1If9C9heHbGubBlyvgYdtMcBx?= =?utf-8?q?D4u1y+csXkwdE4wsIki43yjQCTUnLCK6aOPcgR7qN7MlaUR2g3cHAsKztIheQrG5m?= =?utf-8?q?Cte4L1FyI4GU?= X-OriginatorOrg: vivo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 20bfc1ac-4b7f-4cdf-5e3b-08db83786235 X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jul 2023 08:08:47.2088 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: i4iTMVMt/atlsNE+wXCxkBV/4wZ9xSM52c48akmT85Vo0PaVzrMs3sTwx29igpcPZ4JXtQASChndHgDQrHGNkA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: KL1PR0601MB4371 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,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 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771292497079386362 X-GMAIL-MSGID: 1771292497079386362 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 (mostly) ignored 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. Trivially convert this driver from always returning zero in the remove callback to the void returning variant. Cc: Uwe Kleine-König Signed-off-by: Yangtao Li --- drivers/mmc/host/rtsx_pci_sdmmc.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/mmc/host/rtsx_pci_sdmmc.c b/drivers/mmc/host/rtsx_pci_sdmmc.c index 8098726dcc0b..5465a7225df4 100644 --- a/drivers/mmc/host/rtsx_pci_sdmmc.c +++ b/drivers/mmc/host/rtsx_pci_sdmmc.c @@ -1523,14 +1523,14 @@ static int rtsx_pci_sdmmc_drv_probe(struct platform_device *pdev) return 0; } -static int rtsx_pci_sdmmc_drv_remove(struct platform_device *pdev) +static void rtsx_pci_sdmmc_drv_remove(struct platform_device *pdev) { struct realtek_pci_sdmmc *host = platform_get_drvdata(pdev); struct rtsx_pcr *pcr; struct mmc_host *mmc; if (!host) - return 0; + return; pcr = host->pcr; pcr->slots[RTSX_SD_CARD].p_dev = NULL; @@ -1566,8 +1566,6 @@ static int rtsx_pci_sdmmc_drv_remove(struct platform_device *pdev) dev_dbg(&(pdev->dev), ": Realtek PCI-E SDMMC controller has been removed\n"); - - return 0; } static const struct platform_device_id rtsx_pci_sdmmc_ids[] = { @@ -1581,7 +1579,7 @@ MODULE_DEVICE_TABLE(platform, rtsx_pci_sdmmc_ids); static struct platform_driver rtsx_pci_sdmmc_driver = { .probe = rtsx_pci_sdmmc_drv_probe, - .remove = rtsx_pci_sdmmc_drv_remove, + .remove_new = rtsx_pci_sdmmc_drv_remove, .id_table = rtsx_pci_sdmmc_ids, .driver = { .name = DRV_NAME_RTSX_PCI_SDMMC,