Skip to content

Commit 8401659

Browse files
Uwe Kleine-KönigUlf Hansson
authored andcommitted
memstick: rtsx_pci_ms: Convert to platform remove callback returning void
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 ignored (apart from emitting a warning) 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. Eventually after all drivers are converted, .remove_new() will be renamed to .remove(). Trivially convert this driver from always returning zero in the remove callback to the void returning variant. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Link: https://lore.kernel.org/r/512d6b6a4d3b8a02cee28635a936340f5f70c65e.1712757795.git.u.kleine-koenig@pengutronix.de Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
1 parent 2599881 commit 8401659

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

drivers/memstick/host/rtsx_pci_ms.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,7 @@ static int rtsx_pci_ms_drv_probe(struct platform_device *pdev)
574574
return 0;
575575
}
576576

577-
static int rtsx_pci_ms_drv_remove(struct platform_device *pdev)
577+
static void rtsx_pci_ms_drv_remove(struct platform_device *pdev)
578578
{
579579
struct realtek_pci_ms *host = platform_get_drvdata(pdev);
580580
struct rtsx_pcr *pcr;
@@ -610,8 +610,6 @@ static int rtsx_pci_ms_drv_remove(struct platform_device *pdev)
610610

611611
dev_dbg(&(pdev->dev),
612612
": Realtek PCI-E Memstick controller has been removed\n");
613-
614-
return 0;
615613
}
616614

617615
static struct platform_device_id rtsx_pci_ms_ids[] = {
@@ -625,7 +623,7 @@ MODULE_DEVICE_TABLE(platform, rtsx_pci_ms_ids);
625623

626624
static struct platform_driver rtsx_pci_ms_driver = {
627625
.probe = rtsx_pci_ms_drv_probe,
628-
.remove = rtsx_pci_ms_drv_remove,
626+
.remove_new = rtsx_pci_ms_drv_remove,
629627
.id_table = rtsx_pci_ms_ids,
630628
.suspend = rtsx_pci_ms_suspend,
631629
.resume = rtsx_pci_ms_resume,

0 commit comments

Comments
 (0)