From patchwork Thu Jul 13 08:08:06 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: 119666 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp1680812vqm; Thu, 13 Jul 2023 01:45:46 -0700 (PDT) X-Google-Smtp-Source: APBJJlFkqmmwATikQAjT8eEGuatpMMBibc15svKjZUU2Ip10+p/nHBGtq7oHXYwmeo0QLUX+oww9 X-Received: by 2002:a2e:9c93:0:b0:2b6:c16a:db06 with SMTP id x19-20020a2e9c93000000b002b6c16adb06mr878149lji.39.1689237946011; Thu, 13 Jul 2023 01:45:46 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1689237945; cv=pass; d=google.com; s=arc-20160816; b=EN6XyNQ8z+JFCWoJFNMXk9u/9Mu1h9N+rMhGE6JwqRghaTGwHMS8SxxxTCPRDM5mqm VRnKMAaiVO14HRoUOdoyJzDu1anGCds2HaNWYUZGbCitnIEGUhyJGEpccCarJzFf/zVd X+Gujfz00ivGsYmnkhMVtOHMGvKUCGnJypA7+FS6Zky2WkmbqfNPGxX1Ke7xASRurFod AECQvnZQoi9u0eDo7R4Y5Rj0XBabQa+Px08o8TI/e9JQHXubXWedE/xm+f+/PeX+wkk/ cqQdcS95399Y2QMeELUlvRBt8r43nhBrNZGy7bqGJwC6cssVtssfX+DFQGRi0PwVf/xs 5RUQ== 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=zn1Y0HfAvqC4vDw6hlHUiBXNgQB8DADiyKB9NqPTMOI=; fh=0iHszlw8fNpVBkpURB26xhKwjOImohP+yFot/WpzIGs=; b=BAwLwejBjHqRCf6tolGPlGcRxWy1PFgWVnYxrjixeelxO5veWDmBDSHe8inQI+XTEO JF4JOgk8879Uc79ea+eqlqDFu/vUj0SLs3GrFBH+Y6rcnqXdfjKKLke6Q6lUpOIqqOUN q4CnfztVd0NJSgbXcuaa7Kp5p1dsyl9upr3/hr7AcRSie9e9vSM/dh65izDLzyz14Lii XIMEB3uMT6gDifuRRtqqb79ig8VbO6PpRwnzo/HJCqfY7xoYfVXsolY+L0ogn1jrBGgC JAa/QPSP8O60O4dEFzlRbJ4FDRMcKgoXvLRz36pwzhGAkMa6b4IBwKE1otVsO3/Uwhfp XG4Q== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@vivo.com header.s=selector2 header.b=Z55meHdK; 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 g15-20020a17090670cf00b00993181656b3si6280843ejk.453.2023.07.13.01.45.22; Thu, 13 Jul 2023 01:45:45 -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=Z55meHdK; 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 S234512AbjGMIP2 (ORCPT + 99 others); Thu, 13 Jul 2023 04:15:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49802 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233831AbjGMINi (ORCPT ); Thu, 13 Jul 2023 04:13:38 -0400 Received: from APC01-PSA-obe.outbound.protection.outlook.com (mail-psaapc01on2107.outbound.protection.outlook.com [40.107.255.107]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 865433AAE; Thu, 13 Jul 2023 01:10:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BFG+BmRmKmBMGzF81Gec2TEtUeH2wCPksSuqPKXwnaMFghL1houS00jyCdPhmhtdQZ3kQaTn3F4jcLJb9OKeCfLIC8zbG1Rofl2dPba0fLaIIWdZCOESBs0CfZcr5vT8/uqPOOGyOgRnJvnHM/Z9AqEBpuw04YLYAMp5/bmiBEqpKi2ZgEVLQedMfZY3t/M8y6Zhl2QKRCEftfOvqKMbEy1xcmGsVlMOGlHOHi/UP5r0WxrUScL+K8wj5LX8B33+VgbOn0jpgAaniOiaIQIt/6+VjwwLAnAaUBgs75IQOHACbbuHwB4XNOjQq3dy28KYzcoNP3FGq71fInIyP6sySg== 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=zn1Y0HfAvqC4vDw6hlHUiBXNgQB8DADiyKB9NqPTMOI=; b=HrK6z5AMj70je8YcmBcm+vAiO0m2WcVgwXTDVMTYp8nmf9+8W6gQn3OijJMXAw3YEOFnQZMrEdKI7jBier8e9nJopbbhq7DX3gVDDuf42No8kTZaqw0MzrLPkS6h7GCv63LFcLDp1i/WJhsFOJZr9DIACCbA2kzRZqG3NmUG57SuhO88bY+7uL4/2BuNDSpCkwcHDlMGqQj5zXT9Gc9ukr+zZSl+zeCRAx4E8/WAmgfGs80O3AmBXrYK1zI05kkG8A7KyYiLnZx3ZAzmFPqMrrAdUH1qThQbUbRheHlKtN9fFpBRyDnxZL6Sq3LG1SqbZU3gHPHQWU9rkbVD1zSTuQ== 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=zn1Y0HfAvqC4vDw6hlHUiBXNgQB8DADiyKB9NqPTMOI=; b=Z55meHdKQBxF+JqyXbyIabX1IifDfQOgcmwtPCZDM5VAvamkzuAArkKHEOF2a98n5fg30eo2nTpxH+ilIkPGkIPnwCDLZwbfPzOGix20xU+f+VbSfN9tXhoayA6xzmzS93Way19lF/nrCkp16S98XKQ+HMa1QiwNz/cUo3XAVR8Tx6alVi4Um99hiqucl3GQjxvT8AMXTOx3Ox21HAFXsPgu7NUXP4PzmonzgKBDh+dOpPV3eg5N2f5nHKHPVRylEOD53zDwesMIaNymP6gHqFhceH9tE8IhyFPom7A+DKpUJrEnZRKi41Vc9V+lw3XPf4YzjewRTPNOXjaMSYJ5rQ== 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 PUZPR06MB5984.apcprd06.prod.outlook.com (2603:1096:301:118::6) 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:10:04 +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:10:04 +0000 From: Yangtao Li To: Wolfram Sang , Ulf Hansson Cc: Yangtao Li , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , linux-mmc@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 57/58] mmc: renesas_sdhi: Convert to platform remove callback returning void Date: Thu, 13 Jul 2023 16:08:06 +0800 Message-Id: <20230713080807.69999-57-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_|PUZPR06MB5984:EE_ X-MS-Office365-Filtering-Correlation-Id: b64e81ab-a4b7-45ce-b5f7-08db83788dfd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: e+ncANHYyQaFGAykaVamhdYGjzksWfXuh4zQq6Ms2iJ4gRtueekeM0HJDXIQuGlJsh8yQMCoDZE1DWx1jIEdLrFK1XWGmOZBtGCJS1t3sFoclx6UiSn1S8k+4jKthCIBjo0vCZLRQXF9dtLds6qKuITesZeK3DT3anURlLMvMHZgGK2jiPE5GCdyHXShVD2mThm204TElSZjd6F2szewW1VCUSHpnY2wpZybCdGImNaTEVxJsLDChEJQ3HehJZcc/ddc/OPGIB4UTz96EiDaxChOJMM9mYAfiPpnBRtA+JEVyG9a9Z0h6ypVfXJuG7XjeE3tuSvnQ1VeTR8CpNt66kD7ltvaFoDlCSGD7FpDv8dUls5ps62edg0sfP1BSU4lde5Vr4CgvojJLi79lHAXb3QoSF08OYQMOSKgeU61nzDTM+lRK8THQZfyxymdgOmoJWeQeB1VxU2u1ZE1+Cj8RaESpUAOFZ6Jji0YRarO5KP8Tc+2UqgAc8HYJQn6NzCky+LgZfL+cODu/EOrci3Ly7I5WFj3ez9YBwwEx3G0P0o3hGdqTR5m/461sSvuKF/1nAsCckWibXjJ7Qr32e4OWXiLX6MNl7pkOamNvg5Iwk/tmpcz8kj73gm9M15eWUpb 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)(136003)(346002)(376002)(396003)(39860400002)(366004)(451199021)(478600001)(110136005)(54906003)(52116002)(66476007)(66946007)(66556008)(6486002)(4326008)(316002)(41300700001)(2616005)(186003)(2906002)(8936002)(8676002)(38100700002)(6506007)(1076003)(36756003)(26005)(5660300002)(6512007)(86362001)(38350700002)(83380400001);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?NQVT8OXvy7ga1H5/unJfi3rY+yQN?= =?utf-8?q?3QiCCU3Qfrlw36iVimBA2oXpsQNc5ZYa1LirT9G7P9kUEHunaFZGez9tzK2eiBPhY?= =?utf-8?q?ESBR3D/exoEefdKmW/RO7wpO+AiQWZRsaz2Tv1yLG8jCbWwIqpcOG0sFdY0k2FZYA?= =?utf-8?q?nbLXeCWqaXI0cYLqev4A63myrpTEWEyfAhNETZfjMBaUtDLUcfYfV09vnyutBe1VY?= =?utf-8?q?W0CHIOxhdgTxldbJ8sVoy45cXinVjiIoGiJzZ082OqwxqupVNuOqtnxx+BfjuVhiI?= =?utf-8?q?9gKBOZVSOZj+6NgsEEWKUgkJFdy8jS5OoXqjT1gmvloKJa+5v/tPu8hnseVw239g0?= =?utf-8?q?x1Hv5jEru1UHIN04H6ABvTqe78Lb8G/uqT3B1GaSlWdMJVO2tPCED4FilZCMBZSQl?= =?utf-8?q?kOdmcMoHqDeWGEfdW/l0Mr+1XFWODA7gFY5yYItYtjPqVxT6AzUMRR+WEfGBJJr9x?= =?utf-8?q?6YqAns4nFJDsrCDFT1UDpqjPBCf6yg4YXdwRvfkicTIGaNGVD0gq4Fx1/yY790hnA?= =?utf-8?q?ylNYxbMvuimDQZuF4l3TrvFB1NTj3bdQV+ap5FISn1pK0XxaqXWp5cQHLReMGdNZT?= =?utf-8?q?qjEIfaGZ0Jx2OxX2vytkDJGkT4aEU+hvOlGIk6fpB37hgBXK6hhtAtBhSAVk4ENNc?= =?utf-8?q?TbzFi8gZUee8xm16SLnoT/0JhNEi9v/wP0iPKTaaiiR89qP9tQE6GOF75da9Dv8Xr?= =?utf-8?q?yyz6jl8ZHztHJf3lduLMH7ZOOujBOZn51TCSetfjr+E8ifmAngpzqye6X3LvL+H1L?= =?utf-8?q?SzRcVgm4SLeSSzrwwkYzzFbM47fvRrLNh8iRl55VCGwdxn2LiblNwR4W4MFi/xSGX?= =?utf-8?q?ImYmnFD0iGURb76Se717YZq2rJ6z2bHtECKdIjhWgiseSNBTourv+mUtq26TTo3SA?= =?utf-8?q?T8lCgc1znCKQHGKPRKFu0mF2z/elgfi2Gt22ulSRYXUXcZRxu4qHkNEqdNukLIPAl?= =?utf-8?q?oOyaLXx4N4ScgDVm2FdtgLA9wPTiAMoxrKEiy1qVW24O7r77E0t+N7dAU6iT1NxuK?= =?utf-8?q?ZUnT4CpExU98phHbU638ergu1c/JOSGMq8cTazdurumaJgknjNjYvYujNzzNaG8r7?= =?utf-8?q?sDpqIpr6TFRnaBHJ1MMA1qSBEe7OOK6ohdX8EQ89KrnsHorulqme0cbVeDl8fruOJ?= =?utf-8?q?qY2o7IyHNFWU20BgJB528E7mdq0ONPrMWZtUFFqWlkODAxTHBIvQgQn0R8pml/6Zn?= =?utf-8?q?CzP+aIT9lUqy5AWq17m4ieilMHPgC/ntzqoudC5wdMbT49jtcdF3cdMsrRh3bNsOk?= =?utf-8?q?kP3Em5XY+O67B/G06trKA1BJjT+1soFfaOsYfSgLI9GtKRrznQgwfy6O5qfU1U52x?= =?utf-8?q?W6bH/duYBpg5aIKX9UVehXTmQHisOynUhXeQLrjO8m87K7budj0vETAUxwTFvtEHF?= =?utf-8?q?klgbFs04M+JTxAyYdXqaQxLkwj8CQXOT4n0P67+fCRK/a8W1mUxnuO+EUnt5GUXD9?= =?utf-8?q?CMih6G26i67xH/za0k06/5GAqalB34ylGCpscjHCo+DVJAbWmflQs/5cf33YCXzf+?= =?utf-8?q?QFq/sIrIpSS3?= X-OriginatorOrg: vivo.com X-MS-Exchange-CrossTenant-Network-Message-Id: b64e81ab-a4b7-45ce-b5f7-08db83788dfd 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:10:00.5975 (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: PTFK1CBr3S3scj23z27BhXRGu/Qpq4cO84XNpol+x9MJFf4PA4EAVEgl8GRPUt+ablYtCK2TJBwQya7s49vROw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PUZPR06MB5984 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: 1771294368647140400 X-GMAIL-MSGID: 1771294368647140400 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 Reviewed-by: Geert Uytterhoeven --- drivers/mmc/host/renesas_sdhi.h | 2 +- drivers/mmc/host/renesas_sdhi_core.c | 4 +--- drivers/mmc/host/renesas_sdhi_internal_dmac.c | 2 +- drivers/mmc/host/renesas_sdhi_sys_dmac.c | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/mmc/host/renesas_sdhi.h b/drivers/mmc/host/renesas_sdhi.h index 68da3da9e2e5..c1fb9740eab0 100644 --- a/drivers/mmc/host/renesas_sdhi.h +++ b/drivers/mmc/host/renesas_sdhi.h @@ -101,5 +101,5 @@ int renesas_sdhi_probe(struct platform_device *pdev, const struct tmio_mmc_dma_ops *dma_ops, const struct renesas_sdhi_of_data *of_data, const struct renesas_sdhi_quirks *quirks); -int renesas_sdhi_remove(struct platform_device *pdev); +void renesas_sdhi_remove(struct platform_device *pdev); #endif diff --git a/drivers/mmc/host/renesas_sdhi_core.c b/drivers/mmc/host/renesas_sdhi_core.c index 345934e4f59e..5d3adef144d7 100644 --- a/drivers/mmc/host/renesas_sdhi_core.c +++ b/drivers/mmc/host/renesas_sdhi_core.c @@ -1145,15 +1145,13 @@ int renesas_sdhi_probe(struct platform_device *pdev, } EXPORT_SYMBOL_GPL(renesas_sdhi_probe); -int renesas_sdhi_remove(struct platform_device *pdev) +void renesas_sdhi_remove(struct platform_device *pdev) { struct tmio_mmc_host *host = platform_get_drvdata(pdev); tmio_mmc_host_remove(host); renesas_sdhi_clk_disable(host); tmio_mmc_host_free(host); - - return 0; } EXPORT_SYMBOL_GPL(renesas_sdhi_remove); diff --git a/drivers/mmc/host/renesas_sdhi_internal_dmac.c b/drivers/mmc/host/renesas_sdhi_internal_dmac.c index 9ab813903b2c..d8efb8035b1f 100644 --- a/drivers/mmc/host/renesas_sdhi_internal_dmac.c +++ b/drivers/mmc/host/renesas_sdhi_internal_dmac.c @@ -609,7 +609,7 @@ static struct platform_driver renesas_internal_dmac_sdhi_driver = { .of_match_table = renesas_sdhi_internal_dmac_of_match, }, .probe = renesas_sdhi_internal_dmac_probe, - .remove = renesas_sdhi_remove, + .remove_new = renesas_sdhi_remove, }; module_platform_driver(renesas_internal_dmac_sdhi_driver); diff --git a/drivers/mmc/host/renesas_sdhi_sys_dmac.c b/drivers/mmc/host/renesas_sdhi_sys_dmac.c index b559ad38b667..248dfeef942a 100644 --- a/drivers/mmc/host/renesas_sdhi_sys_dmac.c +++ b/drivers/mmc/host/renesas_sdhi_sys_dmac.c @@ -470,7 +470,7 @@ static struct platform_driver renesas_sys_dmac_sdhi_driver = { .of_match_table = renesas_sdhi_sys_dmac_of_match, }, .probe = renesas_sdhi_sys_dmac_probe, - .remove = renesas_sdhi_remove, + .remove_new = renesas_sdhi_remove, }; module_platform_driver(renesas_sys_dmac_sdhi_driver);