Commit 1843671f authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Keith Busch

nvme-apple: 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: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
parent 0889d13b
...@@ -1532,7 +1532,7 @@ static int apple_nvme_probe(struct platform_device *pdev) ...@@ -1532,7 +1532,7 @@ static int apple_nvme_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int apple_nvme_remove(struct platform_device *pdev) static void apple_nvme_remove(struct platform_device *pdev)
{ {
struct apple_nvme *anv = platform_get_drvdata(pdev); struct apple_nvme *anv = platform_get_drvdata(pdev);
...@@ -1547,8 +1547,6 @@ static int apple_nvme_remove(struct platform_device *pdev) ...@@ -1547,8 +1547,6 @@ static int apple_nvme_remove(struct platform_device *pdev)
apple_rtkit_shutdown(anv->rtk); apple_rtkit_shutdown(anv->rtk);
apple_nvme_detach_genpd(anv); apple_nvme_detach_genpd(anv);
return 0;
} }
static void apple_nvme_shutdown(struct platform_device *pdev) static void apple_nvme_shutdown(struct platform_device *pdev)
...@@ -1598,7 +1596,7 @@ static struct platform_driver apple_nvme_driver = { ...@@ -1598,7 +1596,7 @@ static struct platform_driver apple_nvme_driver = {
.pm = pm_sleep_ptr(&apple_nvme_pm_ops), .pm = pm_sleep_ptr(&apple_nvme_pm_ops),
}, },
.probe = apple_nvme_probe, .probe = apple_nvme_probe,
.remove = apple_nvme_remove, .remove_new = apple_nvme_remove,
.shutdown = apple_nvme_shutdown, .shutdown = apple_nvme_shutdown,
}; };
module_platform_driver(apple_nvme_driver); module_platform_driver(apple_nvme_driver);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment