mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-05 01:54:09 +08:00
spi: spi-ti-qspi: 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(). Add an error message to the error path that returned an error before to replace the core's error message with more information. Apart from the different wording of the error message, this patch doesn't introduce a semantic difference. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Link: https://lore.kernel.org/r/20231105172649.3738556-2-u.kleine-koenig@pengutronix.de Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
424a816676
commit
2f2802d1a5
@ -907,21 +907,22 @@ free_master:
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int ti_qspi_remove(struct platform_device *pdev)
|
||||
static void ti_qspi_remove(struct platform_device *pdev)
|
||||
{
|
||||
struct ti_qspi *qspi = platform_get_drvdata(pdev);
|
||||
int rc;
|
||||
|
||||
rc = spi_master_suspend(qspi->master);
|
||||
if (rc)
|
||||
return rc;
|
||||
if (rc) {
|
||||
dev_alert(&pdev->dev, "spi_master_suspend() failed (%pe)\n",
|
||||
ERR_PTR(rc));
|
||||
return;
|
||||
}
|
||||
|
||||
pm_runtime_put_sync(&pdev->dev);
|
||||
pm_runtime_disable(&pdev->dev);
|
||||
|
||||
ti_qspi_dma_cleanup(qspi);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct dev_pm_ops ti_qspi_pm_ops = {
|
||||
@ -930,7 +931,7 @@ static const struct dev_pm_ops ti_qspi_pm_ops = {
|
||||
|
||||
static struct platform_driver ti_qspi_driver = {
|
||||
.probe = ti_qspi_probe,
|
||||
.remove = ti_qspi_remove,
|
||||
.remove_new = ti_qspi_remove,
|
||||
.driver = {
|
||||
.name = "ti-qspi",
|
||||
.pm = &ti_qspi_pm_ops,
|
||||
|
Loading…
Reference in New Issue
Block a user