diff options
author | Jingoo Han <jg1.han@samsung.com> | 2013-09-24 00:51:32 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-09-26 06:43:08 -0400 |
commit | 716db5d64f5f9bd6600cd4f85c2986d34cd7f60e (patch) | |
tree | 442986f0fc006d9dd47408475810f7a5c763ebb5 /drivers | |
parent | f12f7318c44aa5ea1672f9a356de02a8739b6892 (diff) |
spi: tegra20-slink: 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')
-rw-r--r-- | drivers/spi/spi-tegra20-slink.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/spi/spi-tegra20-slink.c b/drivers/spi/spi-tegra20-slink.c index c70353672a23..829283e785d9 100644 --- a/drivers/spi/spi-tegra20-slink.c +++ b/drivers/spi/spi-tegra20-slink.c | |||
@@ -1164,7 +1164,7 @@ static int tegra_slink_probe(struct platform_device *pdev) | |||
1164 | pm_runtime_put(&pdev->dev); | 1164 | pm_runtime_put(&pdev->dev); |
1165 | 1165 | ||
1166 | master->dev.of_node = pdev->dev.of_node; | 1166 | master->dev.of_node = pdev->dev.of_node; |
1167 | ret = spi_register_master(master); | 1167 | ret = devm_spi_register_master(&pdev->dev, master); |
1168 | if (ret < 0) { | 1168 | if (ret < 0) { |
1169 | dev_err(&pdev->dev, "can not register to master err %d\n", ret); | 1169 | dev_err(&pdev->dev, "can not register to master err %d\n", ret); |
1170 | goto exit_pm_disable; | 1170 | goto exit_pm_disable; |
@@ -1191,7 +1191,6 @@ static int tegra_slink_remove(struct platform_device *pdev) | |||
1191 | struct tegra_slink_data *tspi = spi_master_get_devdata(master); | 1191 | struct tegra_slink_data *tspi = spi_master_get_devdata(master); |
1192 | 1192 | ||
1193 | free_irq(tspi->irq, tspi); | 1193 | free_irq(tspi->irq, tspi); |
1194 | spi_unregister_master(master); | ||
1195 | 1194 | ||
1196 | if (tspi->tx_dma_chan) | 1195 | if (tspi->tx_dma_chan) |
1197 | tegra_slink_deinit_dma_param(tspi, false); | 1196 | tegra_slink_deinit_dma_param(tspi, false); |