Skip to content

Commit f16d1b8

Browse files
Uwe Kleine-KönigUlf Hansson
authored andcommitted
memstick: rtsx_usb_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/80969cc7c08c613753bdf2270304983ed0dcc2a0.1712757795.git.u.kleine-koenig@pengutronix.de Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
1 parent 8401659 commit f16d1b8

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

drivers/memstick/host/rtsx_usb_ms.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -805,7 +805,7 @@ static int rtsx_usb_ms_drv_probe(struct platform_device *pdev)
805805
return err;
806806
}
807807

808-
static int rtsx_usb_ms_drv_remove(struct platform_device *pdev)
808+
static void rtsx_usb_ms_drv_remove(struct platform_device *pdev)
809809
{
810810
struct rtsx_usb_ms *host = platform_get_drvdata(pdev);
811811
struct memstick_host *msh = host->msh;
@@ -840,8 +840,6 @@ static int rtsx_usb_ms_drv_remove(struct platform_device *pdev)
840840
": Realtek USB Memstick controller has been removed\n");
841841
memstick_free_host(msh);
842842
platform_set_drvdata(pdev, NULL);
843-
844-
return 0;
845843
}
846844

847845
static struct platform_device_id rtsx_usb_ms_ids[] = {
@@ -855,7 +853,7 @@ MODULE_DEVICE_TABLE(platform, rtsx_usb_ms_ids);
855853

856854
static struct platform_driver rtsx_usb_ms_driver = {
857855
.probe = rtsx_usb_ms_drv_probe,
858-
.remove = rtsx_usb_ms_drv_remove,
856+
.remove_new = rtsx_usb_ms_drv_remove,
859857
.id_table = rtsx_usb_ms_ids,
860858
.driver = {
861859
.name = "rtsx_usb_ms",

0 commit comments

Comments
 (0)