Message ID | 20230713080807.69999-9-frank.li@vivo.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp1679138vqm; Thu, 13 Jul 2023 01:41:50 -0700 (PDT) X-Google-Smtp-Source: APBJJlG/qQpaLFzRgWNgzfc6UpL1SblYlBdEJs9w7XTD3c2CNMCxgHLpuSx/8rrl+gym7gsas9fi X-Received: by 2002:a17:907:3ac2:b0:993:d5bd:a763 with SMTP id fi2-20020a1709073ac200b00993d5bda763mr744121ejc.20.1689237709858; Thu, 13 Jul 2023 01:41:49 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1689237709; cv=pass; d=google.com; s=arc-20160816; b=mEYZqCrSOn/AyJ1L2ei6DtJtrTXz9LAb2JY24pZLQX4j1GugG0gbKm1ldPDCXwyOqt EbJPe8XURTgJYQnabjznbvp0OFYfSmZeo/Llj/p6Rz6toYGbEbumcjXRD/Mvp7kSKwUf 5jiBDVQmDFpg+8YMW6Rn+Urf20zrXN8JnW7nrcdvzgFvocZJvOsPLTXL5KhUhb3s37ST h/wUnNMml+MGNmk/Y2Zw2/+dUDHvbVNyt/WBzKBc1ayGtbc/WA46Q/8PlvolYelE4Loo lGe76MAH9nrcpXX8t3IuuKC4l269V0hT720iHuLLlE2T5933Mh2NSukUwBWOESvz0jNZ fRiQ== 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=df1DKbWeg+xqkSYPtOjL8RorXDmDCAUtgwB9kJK//H0=; fh=bJZZHQZH+VGE6F+8RE90TGtTwv5nTUcl0TOIcmRPvoA=; b=sBjMb3MYYB8CAN6bw2Zphb6zhzROwmds8ANIp+kxfyAeIo9EdWUVNqXfzwwtryf4yb RGY59lelfXDXSzyF7/LoB0JtmTfJ/nbcfarI8BaXRFuPeZMhCyzjHrU/N27S9mt/bHU6 DIRitTQgDxhlcusrLm+n1k0I/iYSTozjHBbsAYBGiowAPF9ILmYjIX1IrGnO4o8PeJf6 ywMZ8q1asQzeWdR+6Sojp5a33+M3FOOMlcH2sGbB6zKvNLD2K983UueisaxipuCUfjHn jgvuFZVHo34aaX55nyEKdiJ0nZze81TdHvQN4brxToDHHfP+h8APrIktRPFtEjJpOi/Z shAw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@vivo.com header.s=selector2 header.b=md32cjf0; 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 k9-20020a1709063e0900b00992860fb029si7601902eji.642.2023.07.13.01.41.25; Thu, 13 Jul 2023 01:41:49 -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=md32cjf0; 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 S234127AbjGMIKq (ORCPT <rfc822;tebrre53rla2o@gmail.com> + 99 others); Thu, 13 Jul 2023 04:10:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49864 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233906AbjGMIJt (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Thu, 13 Jul 2023 04:09:49 -0400 Received: from APC01-SG2-obe.outbound.protection.outlook.com (mail-sgaapc01on2115.outbound.protection.outlook.com [40.107.215.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1F16B2D4B; Thu, 13 Jul 2023 01:08:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hWsbBNUvsk3a6tHrEl6oUj18qkavwE4pw4klaIPY7vE6EArw23V6UuK+Fl3coRFqbloPaHSPNkT2CxeMuzN6UNa0cqnKmM/SPEFOq+39QVLLVw7qjn7pRpYiLGPMoZsznzzOTp9gi1JgfX31G9+J91pCTvEm2xlS993BHJ2Dehuw3OQuwq453qPDANlJnzxlZzT6MMElHJx0CbQXJx6Kgg0CdCM+whu4gj1LsW++7IElQP4RpeXDfk3ZFm/jysuWpo7yRJnSrdNilfgfungHERmnV2dEu7cYOcSE6euBNPLibTJ+uy1q4MycGBk5mrsIWOlncw1F4/5hU+dWHiwwVA== 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=df1DKbWeg+xqkSYPtOjL8RorXDmDCAUtgwB9kJK//H0=; b=ONNbHsFEmTxwebA2oPN5iJvGOB/OQGPOhokU592wVO0MMIjjKm3aC7fvyxbVcgSwGiVM/nDwJgxb25qmw4tMsQyGd54e5E0GAQ1j+mARi+3y5tFjA6FuvD9wDiAOPISN4e+clz4L4mxnywHdhcSWBAu6gx3uGbl4GsMfl79PQl6z9IEWL0wmf/fPn2yVIVEKHkNAQOZGDjVKjKc45gEBS8bHR/HjzZ8TqQ51KBrSn4Fgy8BJw98G9ecmyXyqvoRbA1tVjdxxwfEMAgTiWMLCoNFpvb+a39MqhZHwSOGoaYs2vh6d1W/f+H6x4T/e8sm/FPxuOzZ/AFMGHx9cxuFCzQ== 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=df1DKbWeg+xqkSYPtOjL8RorXDmDCAUtgwB9kJK//H0=; b=md32cjf05J8ArcVzr9GIhN1Qx901qVLJYNE2758OL/r3P8Wfwj+nRjGlhImWOV5ExWgyOIBdUvIklbcDMk/DGECmheyLvbNPdTL3lJcUpUDzUQdW2I8ABpc3JyKQtgItGRhd91sbjF85bjeYE9MwMLxyEapRQLiy5FOne7s91PbarMIl0sr7mKDIw9+sgGU5P8oRZgiI1FE7+jAsQEKeluCUrQIvmWAJBFoOD6bpKvRuQGJd+ECjo8LvT801fisfQLucj6551HikL2k7Tbe11def0p0CzDrerHpUse4pDS1Sn4k6Wnl6BDqkhjr9MW+2EXBqvezdFAuSduk3KLotBA== 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:35 +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:35 +0000 From: Yangtao Li <frank.li@vivo.com> To: Adrian Hunter <adrian.hunter@intel.com>, Ulf Hansson <ulf.hansson@linaro.org> Cc: Yangtao Li <frank.li@vivo.com>, =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>, linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 09/58] mmc: sdhci-pic32: Convert to platform remove callback returning void Date: Thu, 13 Jul 2023 16:07:18 +0800 Message-Id: <20230713080807.69999-9-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> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: 0be406aa-ad09-4cb5-e66d-08db83785aea X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6sXIRJAaaQTil2xgkLIa6zzhcqLzxIXTDUVBneAwcCqFnOkbBT7v6VPACyMYew04G5XuArfvjnoMeisUlhRiBiwcx2K1TLA9opJbp0OtqNizTluQiQ71ArJILwQhOakBiKDbsBpurzIDaM6b8xiq2j9jv3pNbkqSl0qlnFj7BzmkWsRE4nxp7NUFgcrD6kf0eK+I+46PCe1ECi7HgjCaWOF4NEJlQOMzUZJPlnQEQY13gMhuQx02f2ezvdrQkpcSPrcHGRI4dxLUwIz5qePPacEPCjWD3MEKwTjjlF79B2EWPj0qMZwd4HrTrfSkDwgMYW30dyZo1PjNkpOJHe2Z/sjmMSEdDzpAzSiyemgmta48iC6os2T1N2fv7TScwfNPETzaNvP63bxgF6mscCNF8s5aYTnPJsrXQrMxtwKDabRlBxbkUs29agwAj2div4ZHxGjaHSdeCkoCvqFdFOfve2uD8Tqw+p6QEVVSY2fwaMFdwCjxFuAjldx7nPbBX1o3zRivQjnX6SUvDLt6b+qvDVLp0FJQ77KzHIkab6ARRNKVbIkDCeamUJXTNIScSLv7NDX95gOSKRKEUFHICfoqagZNpef6sP/VyU8GBV6xVnG9yV98tA0MowjMgHvC3vFVij1T2jlRKepYCB1XroqWxTPweiyd9jc2ma2qz6eIXE8= 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)(110136005)(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?nnEOvFBGkfOk02RMTTQhiwqhFcXb?= =?utf-8?q?sKfRxISdauiAjoGblczQOCfzHrf/n+lfuDihKRkue1JTvXAuV4jQf8pnsjum5LAWA?= =?utf-8?q?G6Hry8nRdzRcQS+Kbb108q/cXWiW2G3uwfviDyrCVItTHzHUzzO51WZqthCxFZwfa?= =?utf-8?q?sCszv7awMc88PScT4N+w9ZGRXRAk80D4njQpT750svfSQyxV/OK5tQG99Jroxk1dG?= =?utf-8?q?iUy7DHkfkIc9oinWP68DbOiGFpHxj/tsw1YEp0v0SUmdJo/SmA4dp6tLMBja/52Vg?= =?utf-8?q?STsg41Hm25xxEY6IAyesiTbTg5FHDj6KJ5WrybHCWCWtjhq9TQLhsD9WUN436Ymzk?= =?utf-8?q?xf/jv8shi1CS7ju9Sou2ow2qymymV2O1w945ldsn8f9JDrwebVtQnFEVCYu2P83eN?= =?utf-8?q?vUF+nX7aTqKDs+N8lPT86hdVvk2WbDkbaxmXF3OuEaOsfTtb3k1OzvqJ/bHZzh6CT?= =?utf-8?q?JjBbTEO+qSmW20rPw/bLwnXYmHDO0IWBy7PaknlW5e0hkjSziXcgSceY7pE/6b27u?= =?utf-8?q?Z0MBpqOVx1lVU5YChuNrgWiYPnXH2rLRim/qsrfBFHloK48BvfgDLbkM1lUOo3xQE?= =?utf-8?q?pV3ucn8bc1bbbjynbcTS26O3PSFI+1RPg3sihC+hUJjhRBm0hAbNywLGQGcHIi99V?= =?utf-8?q?frWJf+FKXTb4W415R96+3q3wOk1JFIlQhF4N4JGlk0zmM9g9yBV/1LaWSCU5zg4d1?= =?utf-8?q?zRJ6wJMv0GCgPjg4HcJFFEQ2V8/o8gnDqoXpv8KNeSjCYy73z/OMLlaw1h+94HjKz?= =?utf-8?q?nTwRnEf4GZSzq+sx5xSld786/NXs3ottb4oh/nMXGK3SUIO3dotmWavC7PMfPWVE8?= =?utf-8?q?kSBvLfqf1TY23QRN1KfFuLuuE4y5fYqSbFfajwSviwy4kgyrzMueS/9Q5RoqfvtEa?= =?utf-8?q?S3dkv+psImtKmpe5iI60xG4ZFag0fsEVt+V9MFqQH7aIJdMxECHSqAaQYO7aqcdcn?= =?utf-8?q?vTpFe9H3ZwWh1A3s+uTyuMyFLAEOYZaLVtmHCMdZyrIB2y3DO2AuvpTaD/8QoIcJB?= =?utf-8?q?QNOcNi7nOCOaFLog9kQ23IsGyzmucXozIkGXHjcI7N3eKyAQeFJlpttj+09GbPl0i?= =?utf-8?q?fNgxgX8D2JjHsueL6FRDJcRimvoFkH09tNkVu2FVzEzBvQieIFjN1GjLaNDfY2fAq?= =?utf-8?q?Y0cPfPuLI/VidnJB9H3Z3fyhD9+y7Rb3+jwe4l+4NAGH6JocKrqm/XUlkwEl/UFW2?= =?utf-8?q?0A9Jt8zQYnMsdIncFawjyWQE99YF1w/xZFqnGx+0Td/9tCK0HiCu0hB/OGhUqz0JX?= =?utf-8?q?gScA9B1hCBRuF1R28H/+UmOyRSEXB+hzn5568SYL6D11X2/byO3LGk5xwck4VxtqX?= =?utf-8?q?AsKeBiMRZJTUbSvNW/6iBfg2OmlJDn/xrlsJN8WW/WBa8maatii6qipmRcuZafi+4?= =?utf-8?q?xZ63OyX76mH5km0SmlXTcfCvdJ/MSRxr2AAY14v5ylFPKUK3fX3+JTOOnfw3ppUoD?= =?utf-8?q?p5Y5BZNvRP0uNYNxagHEJ6c/bt2JyYMYJjxpFD1Yk+EB2iT0QgpJ64ewp22aDQLpj?= =?utf-8?q?VCSGFbbrEN5o?= X-OriginatorOrg: vivo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0be406aa-ad09-4cb5-e66d-08db83785aea 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:34.9133 (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: BLVeSGbNhLNqPq6XDFU0C6aZIxTTEN7fyCwZg9fUU2uw9tvNnF+ER82Z4q5fFMmfjeUvAKLOW+cnV7YPLxtCLw== 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_BLOCKED, 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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771294121183484775 X-GMAIL-MSGID: 1771294121183484775 |
Series |
[01/58] mmc: sunxi: Convert to platform remove callback returning void
|
|
Commit Message
李扬韬
July 13, 2023, 8:07 a.m. UTC
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 <u.kleine-koenig@pengutronix.de>
Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
drivers/mmc/host/sdhci-pic32.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
Comments
On 13/07/23 11:07, Yangtao Li wrote: > 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 <u.kleine-koenig@pengutronix.de> > Signed-off-by: Yangtao Li <frank.li@vivo.com> For the following patches: [PATCH 09_58] mmc: sdhci-pic32: Convert to platform remove callback returning void - Yangtao Li <frank.li@vivo.com> - 2023-07-13 1107 [PATCH 10_58] mmc: sdhci: milbeaut: Convert to platform remove callback returning void - Yangtao Li <frank.li@vivo.com> - 2023-07-13 1107 [PATCH 12_58] mmc: sdhci-of-at91: Convert to platform remove callback returning void - Yangtao Li <frank.li@vivo.com> - 2023-07-13 1107 [PATCH 15_58] mmc: sdhci-pxav3: Convert to platform remove callback returning void - Yangtao Li <frank.li@vivo.com> - 2023-07-13 1107 [PATCH 19_58] mmc: xenon: Convert to platform remove callback returning void - Yangtao Li <frank.li@vivo.com> - 2023-07-13 1107 [PATCH 20_58] mmc: sdhci-s3c: Convert to platform remove callback returning void - Yangtao Li <frank.li@vivo.com> - 2023-07-13 1107 [PATCH 27_58] mmc: sdhci-of-arasan: Convert to platform remove callback returning void - Yangtao Li <frank.li@vivo.com> - 2023-07-13 1107 [PATCH 28_58] mmc: sdhci-of-dwcmshc: Convert to platform remove callback returning void - Yangtao Li <frank.li@vivo.com> - 2023-07-13 1107 [PATCH 33_58] mmc: sdhci-omap: Convert to platform remove callback returning void - Yangtao Li <frank.li@vivo.com> - 2023-07-13 1107 [PATCH 34_58] mmc: sdhci-of-aspeed: Convert to platform remove callback returning void - Yangtao Li <frank.li@vivo.com> - 2023-07-13 1107 [PATCH 36_58] mmc: sdhci-sprd: Convert to platform remove callback returning void - Yangtao Li <frank.li@vivo.com> - 2023-07-13 1107 [PATCH 37_58] mmc: sdhci-tegra: Convert to platform remove callback returning void - Yangtao Li <frank.li@vivo.com> - 2023-07-13 1107 [PATCH 38_58] mmc: sdhci-acpi: Convert to platform remove callback returning void - Yangtao Li <frank.li@vivo.com> - 2023-07-13 1107 [PATCH 39_58] mmc: sdhci-esdhc-imx: Convert to platform remove callback returning void - Yangtao Li <frank.li@vivo.com> - 2023-07-13 1107 [PATCH 40_58] mmc: sdhci-msm: Convert to platform remove callback returning void - Yangtao Li <frank.li@vivo.com> - 2023-07-13 1107 [PATCH 47_58] mmc: sdhci-st: Convert to platform remove callback returning void - Yangtao Li <frank.li@vivo.com> - 2023-07-13 1107 [PATCH 49_58] mmc: sdhci-esdhc-mcf: Convert to platform remove callback returning void - Yangtao Li <frank.li@vivo.com> - 2023-07-13 1107 [PATCH 51_58] mmc: sdhci-spear: Convert to platform remove callback returning void - Yangtao Li <frank.li@vivo.com> - 2023-07-13 1108 Acked-by: Adrian Hunter <adrian.hunter@intel.com>
diff --git a/drivers/mmc/host/sdhci-pic32.c b/drivers/mmc/host/sdhci-pic32.c index 6696b6bdd88e..7a0351a9c74e 100644 --- a/drivers/mmc/host/sdhci-pic32.c +++ b/drivers/mmc/host/sdhci-pic32.c @@ -210,7 +210,7 @@ static int pic32_sdhci_probe(struct platform_device *pdev) return ret; } -static int pic32_sdhci_remove(struct platform_device *pdev) +static void pic32_sdhci_remove(struct platform_device *pdev) { struct sdhci_host *host = platform_get_drvdata(pdev); struct pic32_sdhci_priv *sdhci_pdata = sdhci_priv(host); @@ -221,8 +221,6 @@ static int pic32_sdhci_remove(struct platform_device *pdev) clk_disable_unprepare(sdhci_pdata->base_clk); clk_disable_unprepare(sdhci_pdata->sys_clk); sdhci_pltfm_free(pdev); - - return 0; } static const struct of_device_id pic32_sdhci_id_table[] = { @@ -238,7 +236,7 @@ static struct platform_driver pic32_sdhci_driver = { .of_match_table = of_match_ptr(pic32_sdhci_id_table), }, .probe = pic32_sdhci_probe, - .remove = pic32_sdhci_remove, + .remove_new = pic32_sdhci_remove, }; module_platform_driver(pic32_sdhci_driver);