diff options
| author |   Jingoo Han <jg1.han@samsung.com> | 2013-09-24 13:40:29 +0900 |
|---|---|---|
| committer |   Mark Brown <broonie@linaro.org> | 2013-09-26 11:42:36 +0100 |
| commit | b95e02b748ce3674a81d5796b5ee398cbccc92df (patch) | |
| tree | 33cc204253a26bf2c7af04cdf5c40e9776bd9324 /drivers/spi/spi-omap2-mcspi.c | |
| parent | spi: omap-100k: use devm_spi_register_master() (diff) | |
| download | linux-dev-b95e02b748ce3674a81d5796b5ee398cbccc92df.tar.xz linux-dev-b95e02b748ce3674a81d5796b5ee398cbccc92df.zip | |
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>
Diffstat (limited to 'drivers/spi/spi-omap2-mcspi.c')
| -rw-r--r-- | drivers/spi/spi-omap2-mcspi.c | 3 |
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) if (status < 0) goto disable_pm; - status = spi_register_master(master); + status = devm_spi_register_master(&pdev->dev, master); if (status < 0) goto disable_pm; @@ -1435,7 +1435,6 @@ static int omap2_mcspi_remove(struct platform_device *pdev) pm_runtime_put_sync(mcspi->dev); pm_runtime_disable(&pdev->dev); - spi_unregister_master(master); kfree(dma_channels); return 0; |