aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2013-09-24 00:40:29 -0400
committerMark Brown <broonie@linaro.org>2013-09-26 06:42:36 -0400
commitb95e02b748ce3674a81d5796b5ee398cbccc92df (patch)
tree33cc204253a26bf2c7af04cdf5c40e9776bd9324
parent5c4c5c7be116b0cce2e71173158060afac4144d0 (diff)
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>
-rw-r--r--drivers/spi/spi-omap2-mcspi.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c
index ed4af4708d9a..2f7fd35a9ac8 100644
--- a/drivers/spi/spi-omap2-mcspi.c
+++ b/drivers/spi/spi-omap2-mcspi.c
@@ -1407,7 +1407,7 @@ static int omap2_mcspi_probe(struct platform_device *pdev)
1407 if (status < 0) 1407 if (status < 0)
1408 goto disable_pm; 1408 goto disable_pm;
1409 1409
1410 status = spi_register_master(master); 1410 status = devm_spi_register_master(&pdev->dev, master);
1411 if (status < 0) 1411 if (status < 0)
1412 goto disable_pm; 1412 goto disable_pm;
1413 1413
@@ -1435,7 +1435,6 @@ static int omap2_mcspi_remove(struct platform_device *pdev)
1435 pm_runtime_put_sync(mcspi->dev); 1435 pm_runtime_put_sync(mcspi->dev);
1436 pm_runtime_disable(&pdev->dev); 1436 pm_runtime_disable(&pdev->dev);
1437 1437
1438 spi_unregister_master(master);
1439 kfree(dma_channels); 1438 kfree(dma_channels);
1440 1439
1441 return 0; 1440 return 0;