diff options
| author | Jingoo Han <jg1.han@samsung.com> | 2013-09-24 13:24:57 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-26 11:41:18 +0100 |
| commit | bca76931b934ad323c56d9aab7a74139306d18bf (patch) | |
| tree | 573ffe5eb19cbb9cdc8195ea22d37ecbedf811da /drivers/spi | |
| parent | 247263dba208fab08c7f49900a9c79adaae1176e (diff) | |
| download | talos-obmc-linux-bca76931b934ad323c56d9aab7a74139306d18bf.tar.gz talos-obmc-linux-bca76931b934ad323c56d9aab7a74139306d18bf.zip | |
spi: bcm63xx: use devm_spi_register_master()
Use devm_spi_register_master() to make cleanup paths simpler,
and remove a duplicate put.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-bcm63xx.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/spi/spi-bcm63xx.c b/drivers/spi/spi-bcm63xx.c index 536b0e363826..80d56b214eb5 100644 --- a/drivers/spi/spi-bcm63xx.c +++ b/drivers/spi/spi-bcm63xx.c @@ -412,7 +412,7 @@ static int bcm63xx_spi_probe(struct platform_device *pdev) bcm_spi_writeb(bs, SPI_INTR_CLEAR_ALL, SPI_INT_STATUS); /* register and we are done */ - ret = spi_register_master(master); + ret = devm_spi_register_master(dev, master); if (ret) { dev_err(dev, "spi register failed\n"); goto out_clk_disable; @@ -438,8 +438,6 @@ static int bcm63xx_spi_remove(struct platform_device *pdev) struct spi_master *master = spi_master_get(platform_get_drvdata(pdev)); struct bcm63xx_spi *bs = spi_master_get_devdata(master); - spi_unregister_master(master); - /* reset spi block */ bcm_spi_writeb(bs, 0, SPI_INT_MASK); @@ -447,8 +445,6 @@ static int bcm63xx_spi_remove(struct platform_device *pdev) clk_disable_unprepare(bs->clk); clk_put(bs->clk); - spi_master_put(master); - return 0; } |
