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:     Ulf Hansson <ulf.hansson@linaro.org>
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 23/61] mmc: rtsx_usb_sdmmc: Convert to platform remove callback returning void
Date:   Wed, 26 Jul 2023 12:00:03 +0800
Message-Id: <20230726040041.26267-23-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?blFMM2NaN0JUZXZRVWFKeHBBcDhWR0hnNStuc25YWUtzUWpTR2VwOXN6dFF3?=
 =?utf-8?B?c293bFE1cGVieEo1MVhLY3hmcVIxMzcwYWVsVkJKRWtWeFdMUjNaTng2V0Fx?=
 =?utf-8?B?Rm80cC9XeHNVY0VPcWc2QWlReXRNaGhLN01UNiszaURMQmFzY1BPSDZNenZl?=
 =?utf-8?B?UEg2NlgxbHNncVhVRWJoaUV1OWtlRElwbnBZV2Q5dVhkSStZcGVNck0zeHBu?=
 =?utf-8?B?N1N6VktwbkR5RzJpVE9BSEw5WWY5THNQVVRPNkg1SitSK1ZSWDUvYmdRZ2ll?=
 =?utf-8?B?cC9hNm8rcHM3cW56N1E1L0VpdEJJbTAwT0NoUE94S3JYa3pwS2kvWGVIaU1p?=
 =?utf-8?B?RlI2SVhyWXNyOWJ1Q3JOUWRkYmhvTy8wbmJYTGVZenZGcUhSbVp5emdJcGdo?=
 =?utf-8?B?NVo2cHhQQmN3Q2N6cmxsSWt6WUQvWEFXdlpmWUxpaENqL3duWnBRSzh5UEhS?=
 =?utf-8?B?YmhJQ2dTeFE2dStPdGJNSTBaMjlPVVVoVEZOOHFWK3Z4UWdCZ3BlTWJyZm12?=
 =?utf-8?B?azAweG1VOGEvT2lXZVFJZ1ZUeDBySFhaa1J4SzB1ZzBUbWJVSlBIR1lmZTla?=
 =?utf-8?B?TjNaQTlocTZRdVdyaEdZK2UyTTRMNFUzYUZOUFU2RU0wTnJXZ2pBRjFMY3Vo?=
 =?utf-8?B?UEwwYSsvV2Zsc2w0NVJBR0NOMllPTXltT3BTemdkUlF5aHRBMzlYZlNBaEk5?=
 =?utf-8?B?b1dGN0FHRVRxNWZlQzB1aUMySkhoUnFNejRXcEhNSkVnbmtmN0E2U0xBQ0ZQ?=
 =?utf-8?B?Y281R1VTNmdabk84VkZLS3FuVit6UHVhbEw3ZFd2bTlLZ0pPOGRUa0RFR2E2?=
 =?utf-8?B?OXNIV0NuWi80ODlpSW9Qc3JIaHo1c3k2ZnBTdzR2UmhmWndqRTJzZzVQb2tR?=
 =?utf-8?B?Z3FyR3lTTWZNNXVjNDRRMG9nZExFb0RyUmYwcTk5QXRId093VmZDeklnd0sw?=
 =?utf-8?B?ZjVYZTVDNGxxVEZTVU4zSGdaZmxwTkdpUnk3bjhZK05IQXhoc3JDUnV5ZDMy?=
 =?utf-8?B?US8vczhGN05FYkx6dlJ1NXNRbk5PUXdRMW1IekZRMkgzSkQ2OGwxVktxVXpK?=
 =?utf-8?B?ZHA1b3FzRUtUNFpmOWFBL3VISlp1VHo5d05TTTBrTGUxTjBBbDdGOGZDOXpC?=
 =?utf-8?B?cEhhdDhsNXNjd0hRYWtRSTkwZU5za0Z2L0RKWDROY1pFL2U5YkNTVDhyR24z?=
 =?utf-8?B?aFVCOURGYXhERkZSd0hHNy85dWV0eFF1TkUvMHBteDBZOC9yWjNVOHlBaC90?=
 =?utf-8?B?N2VqeENPUUZzNTUvMTFzRXZkN0lwcDZXY3M0RjdjM0drVlZyOHkvM1V5VHFJ?=
 =?utf-8?B?NFNyVWF3dXRCU2VEMmREdG4vcXdDRDRqdnZNTllRdjFCVWt3REpERjQza1Jn?=
 =?utf-8?B?ZXJKUUxlcmNyQkZhQ1BJcENjOGp0OE9CNW9Ua2JjSFc3RUJsRTJZb0swRlFn?=
 =?utf-8?B?TE5OWUpjQUFxR1ROVXNzbVpBSmNab2gzK3V3T1VRUE0zbFgrZmM0cklMZlZJ?=
 =?utf-8?B?Y1ZuVUhjdUJ3VndhMXFyb0ZyY3pOc08ySC8yQ29OeTQzN2NySG52Yk1zTStL?=
 =?utf-8?B?ZWZSWEZVeU1uT1JBZmthSkZtaU9Hc210YXlhSWZrVnZjTlR3U3pUdlgrRDVT?=
 =?utf-8?B?Sm5IelBobWJUbGh5S1NLV2d6MHllVGNoaG52VXBZVFI2eWpxK0tCbldXUnZQ?=
 =?utf-8?B?V3IzZTJaSnJZMzRDa3l1cUFnbFR0Z2FsdXFkb3lUNUM5aGwxWk4ydWxlRTFX?=
 =?utf-8?B?cm9ObDRkdWpSS0NHckdXa0d5NHNkd0pNWEV5alEyNk1BZHhocmFzczJ1MGIr?=
 =?utf-8?B?cGhVY05LdWxyVnRtd2ZvTWcxS3p5MnhXSFVEWTBpYmtyTHdtTWVRdzFQaGZp?=
 =?utf-8?B?M1dEZ1dVcVoyQ0Z5YXBMcSswOXZHRzJXRmFpK2x2ZlYzSzN0cHB5MmRxV3I4?=
 =?utf-8?B?QVBINzlrYks5MFdJNUprcUJPTnFqaVdiMjdBNDhnMmNvMkFONld3UDluandS?=
 =?utf-8?B?NXNMUUpFOFpaMmJMK2dkMTRDOS8xM1J2UUg0ZWtsbzVNMWx3djd4aUZWZUdr?=
 =?utf-8?B?UGpPcXdKSTUxOEV4QzFQZmNaR0liNzNsdTd3eDg2SDROVXlzcjkraHRnandC?=
 =?utf-8?Q?djlcOwAoyJ9cusnX0BiLMtGAJ?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 5d669155-5e32-4496-70fc-08db8d8d02f7
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:01:38.4419
 (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: 651XlgwWR74ma3d+owc5ldBzFPf9etPZI4iC4e0qSDNJ9HwD+RVQoaV68nEZRpCUZEOmG3cTpuIfiRjS/bIaig==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYZPR06MB3934
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,
        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/rtsx_usb_sdmmc.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/mmc/host/rtsx_usb_sdmmc.c b/drivers/mmc/host/rtsx_usb_sdmmc.c
index 2c650cd58693..ded9b6849e35 100644
--- a/drivers/mmc/host/rtsx_usb_sdmmc.c
+++ b/drivers/mmc/host/rtsx_usb_sdmmc.c
@@ -1379,13 +1379,13 @@ static int rtsx_usb_sdmmc_drv_probe(struct platform_device *pdev)
 	return 0;
 }
 
-static int rtsx_usb_sdmmc_drv_remove(struct platform_device *pdev)
+static void rtsx_usb_sdmmc_drv_remove(struct platform_device *pdev)
 {
 	struct rtsx_usb_sdmmc *host = platform_get_drvdata(pdev);
 	struct mmc_host *mmc;
 
 	if (!host)
-		return 0;
+		return;
 
 	mmc = host->mmc;
 	host->host_removal = true;
@@ -1415,8 +1415,6 @@ static int rtsx_usb_sdmmc_drv_remove(struct platform_device *pdev)
 
 	dev_dbg(&(pdev->dev),
 		": Realtek USB SD/MMC module has been removed\n");
-
-	return 0;
 }
 
 #ifdef CONFIG_PM
@@ -1455,7 +1453,7 @@ MODULE_DEVICE_TABLE(platform, rtsx_usb_sdmmc_ids);
 
 static struct platform_driver rtsx_usb_sdmmc_driver = {
 	.probe		= rtsx_usb_sdmmc_drv_probe,
-	.remove		= rtsx_usb_sdmmc_drv_remove,
+	.remove_new	= rtsx_usb_sdmmc_drv_remove,
 	.id_table       = rtsx_usb_sdmmc_ids,
 	.driver		= {
 		.name	= "rtsx_usb_sdmmc",
-- 
2.39.0