spi: omap2-mcspi: use devm_spi_register_master()
Use devm_spi_register_master() to make cleanup paths simpler. Signed-off-by: Jingoo Han <jg1.han@samsung.com> Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
@@ -1407,7 +1407,7 @@ static int omap2_mcspi_probe(struct platform_device *pdev)
|
|||||||
if (status < 0)
|
if (status < 0)
|
||||||
goto disable_pm;
|
goto disable_pm;
|
||||||
|
|
||||||
status = spi_register_master(master);
|
status = devm_spi_register_master(&pdev->dev, master);
|
||||||
if (status < 0)
|
if (status < 0)
|
||||||
goto disable_pm;
|
goto disable_pm;
|
||||||
|
|
||||||
@@ -1435,7 +1435,6 @@ static int omap2_mcspi_remove(struct platform_device *pdev)
|
|||||||
pm_runtime_put_sync(mcspi->dev);
|
pm_runtime_put_sync(mcspi->dev);
|
||||||
pm_runtime_disable(&pdev->dev);
|
pm_runtime_disable(&pdev->dev);
|
||||||
|
|
||||||
spi_unregister_master(master);
|
|
||||||
kfree(dma_channels);
|
kfree(dma_channels);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|||||||
Reference in New Issue
Block a user