diff options
author | Jingoo Han <jg1.han@samsung.com> | 2013-09-24 00:26:30 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-09-26 06:42:23 -0400 |
commit | 6221df6d88b847da0803b2ced7826f005e62c837 (patch) | |
tree | b959403309ac8ed5e33d2fbec742749ef4a123f8 | |
parent | bca76931b934ad323c56d9aab7a74139306d18bf (diff) |
spi: bfin-v3: use devm_spi_register_master()
Use devm_spi_register_master() to make cleanup paths simpler.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: Scott Jiang <scott.jiang.linux@gmail.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r-- | drivers/spi/spi-bfin-v3.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/spi/spi-bfin-v3.c b/drivers/spi/spi-bfin-v3.c index f4bf81347d68..8f8598834b30 100644 --- a/drivers/spi/spi-bfin-v3.c +++ b/drivers/spi/spi-bfin-v3.c | |||
@@ -867,7 +867,7 @@ static int bfin_spi_probe(struct platform_device *pdev) | |||
867 | tasklet_init(&drv_data->pump_transfers, | 867 | tasklet_init(&drv_data->pump_transfers, |
868 | bfin_spi_pump_transfers, (unsigned long)drv_data); | 868 | bfin_spi_pump_transfers, (unsigned long)drv_data); |
869 | /* register with the SPI framework */ | 869 | /* register with the SPI framework */ |
870 | ret = spi_register_master(master); | 870 | ret = devm_spi_register_master(dev, master); |
871 | if (ret) { | 871 | if (ret) { |
872 | dev_err(dev, "can not register spi master\n"); | 872 | dev_err(dev, "can not register spi master\n"); |
873 | goto err_free_peripheral; | 873 | goto err_free_peripheral; |
@@ -898,7 +898,6 @@ static int bfin_spi_remove(struct platform_device *pdev) | |||
898 | free_dma(drv_data->rx_dma); | 898 | free_dma(drv_data->rx_dma); |
899 | free_dma(drv_data->tx_dma); | 899 | free_dma(drv_data->tx_dma); |
900 | 900 | ||
901 | spi_unregister_master(drv_data->master); | ||
902 | return 0; | 901 | return 0; |
903 | } | 902 | } |
904 | 903 | ||