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;
From:   Yangtao Li <frank.li@vivo.com>
To:     Adrian Hunter <adrian.hunter@intel.com>,
        Ulf Hansson <ulf.hansson@linaro.org>,
        Orson Zhai <orsonzhai@gmail.com>,
        Baolin Wang <baolin.wang@linux.alibaba.com>,
        Chunyan Zhang <zhang.lyra@gmail.com>
Cc:     Yangtao Li <frank.li@vivo.com>,
        =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= 
        <u.kleine-koenig@pengutronix.de>, linux-mmc@vger.kernel.org,
        linux-kernel@vger.kernel.org
Subject: [PATCH v2 36/61] mmc: sdhci-sprd: Convert to platform remove callback returning void
Date:   Wed, 26 Jul 2023 12:00:16 +0800
Message-Id: <20230726040041.26267-36-frank.li@vivo.com>
In-Reply-To: <20230726040041.26267-1-frank.li@vivo.com>
References: <20230726040041.26267-1-frank.li@vivo.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?M3ExMHNBcVNKWmF2cTNTbXU2a0o0NVh2ek9pZXg3djZXa1pIblFiRVFuUWJH?=
 =?utf-8?B?YUlLNnVKRzl5K1N0QUczcUcxdmd2UTlxaGFSVEZ3eThGVS9kYmVFMUtjUVds?=
 =?utf-8?B?MEVXNjc5NUJSTVQrcVdUNWo4RDZyUEw1MHovQWhwSU92cDEyU3JJVTJ5bHIz?=
 =?utf-8?B?SHdYU1JvZXNBVEliSC9WajA0QXV1OG5VNTJ5UDVpVDBoa0ROaWJXR0hRRFBM?=
 =?utf-8?B?S2pYSzBNeGh0SFpUM2h1NGRaYVcwckkrNXdlQ1RKRjlNcnF3MXo3Vkd6dHIz?=
 =?utf-8?B?YytDWGZvaDlVa1BFUGxYc2ZCSjNoVlY1dU9PT21aUG1WRTR2SHBsSjZiSlJB?=
 =?utf-8?B?K1RMN0NHYytrUUlGdDM0aGY5R2wrTC80Vk9uVWdlVjlEUjFuRlVJN1N4eHVu?=
 =?utf-8?B?Y09oeE1CaVhtK01SV2E2cmtIekJqM0RwanNCRzRWNGplVGl4bHlmcFQ2MDNw?=
 =?utf-8?B?bkxKMDVCVDdoWlBoVS9Pak9obVBWcmpXbldSVEF1L1gybHpYZ3ZVZzY2V3Yz?=
 =?utf-8?B?Q0x2T1N4dTNpMldlNzZmN2YzUjZoOVBJWGJZc3c3Q1lQYjZNOENvcThmbnlW?=
 =?utf-8?B?VklYTmVWNy9rdFJxcCt0K2xzeHV0emlDdG1ETGlESTh5bUovbFdOMHNvYWJn?=
 =?utf-8?B?R3ZRbFlPWHJCa3FmaHpSOXBwdXdHck9qWkRuVzhiODZkQmxXZU15Mjd2blhn?=
 =?utf-8?B?eUZON0UrSERuT3g5ZTNpUFZYV0JrcVNWY1NtSFZ3YnJ2c0hqWnNRWnJZcGVW?=
 =?utf-8?B?ME9ZRTlhUGIxRjlaZlFSU2pvbG1Dd1kraUo0cnFYYkNaUzUwOVhRT3dzWlBL?=
 =?utf-8?B?SWpPbUo2YzZlczJBN1dlV0dZY1pDendCYmo1WEhaSFpXZ0NVM2M3MGxrckhX?=
 =?utf-8?B?dlMzRDdNSG93Z29FOFFFaXE5VGR1QTdUUGNmVVJRdmJOWTVHMitUOUxXbDdZ?=
 =?utf-8?B?R2h2cGNIOFFwdU9KZ3dsbWgvRldtZ1Z2S0VaeXFWRHNZL2JMZ0FFY3BYOW9J?=
 =?utf-8?B?ZGUzOXE3VVhYSHh2U25SNS9jK2NINldod0lNSTNzbTl0UkVJbUhLRTdjSzgw?=
 =?utf-8?B?MDEvRmpSazNxSzJWemRUWTJ4QlVGTTd1dGpCMytJRm1xZWNNS3pJQTMxc0Nz?=
 =?utf-8?B?NTNEWEVGNGNiNDQ4NTdycC9hanRSMWhTNUVFMzJ1OGtYWHB4c3Fhb0xpdzN4?=
 =?utf-8?B?QkMzL3BhZUQ3WklwZnZnVW9rQkRkMUVrVldHZkkydjNsLytsTEQ0WVBveTdN?=
 =?utf-8?B?WG5SZEN0K29DZ3NodjFjeHlSKzFkYkVYcFpDMVRzZGxUWTJHbUVtQVA5MEdR?=
 =?utf-8?B?TkRVVno4a3Awbk5SaTZuK28xZnNUZ0ptSTNlMkE5bjlJSUtHRnFaRVBScnJw?=
 =?utf-8?B?TEJkU05vTTZvRTBkc3ZxQnlvY2Y5YkZySEViT0xRYkg3RzRKZkIrYmdDRjJr?=
 =?utf-8?B?OU1RYkFyb1R5YUpncGtWa0N4YVh5bnpobFZRWDgrOW9jV0tmS25FVmNJeDJI?=
 =?utf-8?B?S1kyRDF1RURmV0RjanRtM2cza1RlUlJiVUVuSnBjQ2twZ3VhVjVwRnhENnEy?=
 =?utf-8?B?S0lISXZTaU55aUk1UjZxeStDNGFUcDM4Qk5aSUEydzlxL2tUdHE4ZXpueng3?=
 =?utf-8?B?bGJPWGlPUFhCbUpSSTNoMlBjWmhrbzdxRkVaWUY5Tks0NjlzYVMwTjhKS3NQ?=
 =?utf-8?B?ZXNQR21OQUpDWFB1b1psRWhzMnZrUmVZMXlYQ0lQdlI2aFZwM1pMVWpDT2Rr?=
 =?utf-8?B?UzBaMVVnOHJ4dG5iaUsxUithcFhRK2tiYVBEcjk4QjlDWWdYYVZVRmlTeld2?=
 =?utf-8?B?a3paWEZ2Y2E1ZVNFaWFpbVlOdW5kSW5TT1FKeERMQ3VQTVFKbnBvZnRMTkZC?=
 =?utf-8?B?VmRQaEhLenlGelRTOFR2Uks0QTRCSWcrRTV0bm9UZnBUSjFrUjJZenF2ek1t?=
 =?utf-8?B?bmpMWjhCeWwrTG1Zd0RQRFF3RDFoWTN6Qk43TUg4bUJJdzh0aHI1YTBEdEFi?=
 =?utf-8?B?aEl4V3ZzUDFUUk1yR1pEQVNTbUlLblhBdGYyMW9RTXpWc2liYjN6eENNdkND?=
 =?utf-8?B?UDVoMkswWEw0cHVKbTJWUGM5M2cyQitWRG1zazE3MVRFSS9qNWRoSDJlWkpJ?=
 =?utf-8?Q?eTV2MJgXYlHXnMd9va8/ALkAI?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 5b8482f6-4488-4ac7-5bc6-08db8d8d104f
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jul 2023 04:02:00.8132
 (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: IIY9JHLlas6scAZxPAzI+etjYm+i87hnS/qGS0wd9L9BuWHG7ZZzapYg5wzIKMp2+dV1ZE/ht8MtFHl9QOZwag==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SI2PR06MB5139
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS,
        T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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

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-sprd.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/mmc/host/sdhci-sprd.c b/drivers/mmc/host/sdhci-sprd.c
index 7f4ee2e12735..379cb3892757 100644
--- a/drivers/mmc/host/sdhci-sprd.c
+++ b/drivers/mmc/host/sdhci-sprd.c
@@ -720,7 +720,7 @@ static int sdhci_sprd_probe(struct platform_device *pdev)
 	return ret;
 }
 
-static int sdhci_sprd_remove(struct platform_device *pdev)
+static void sdhci_sprd_remove(struct platform_device *pdev)
 {
 	struct sdhci_host *host = platform_get_drvdata(pdev);
 	struct sdhci_sprd_host *sprd_host = TO_SPRD_HOST(host);
@@ -732,8 +732,6 @@ static int sdhci_sprd_remove(struct platform_device *pdev)
 	clk_disable_unprepare(sprd_host->clk_2x_enable);
 
 	sdhci_pltfm_free(pdev);
-
-	return 0;
 }
 
 static const struct of_device_id sdhci_sprd_of_match[] = {
@@ -800,7 +798,7 @@ static const struct dev_pm_ops sdhci_sprd_pm_ops = {
 
 static struct platform_driver sdhci_sprd_driver = {
 	.probe = sdhci_sprd_probe,
-	.remove = sdhci_sprd_remove,
+	.remove_new = sdhci_sprd_remove,
 	.driver = {
 		.name = "sdhci_sprd_r11",
 		.probe_type = PROBE_PREFER_ASYNCHRONOUS,
-- 
2.39.0