diff options
author | Mark Brown <broonie@linaro.org> | 2013-10-25 08:51:21 (GMT) |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-10-25 08:51:21 (GMT) |
commit | 52d85ebb7b639448e596a8577bf981f5b139f4fd (patch) | |
tree | 7632999ecf194b9863ad4a86533a91b9f78a28ce /drivers/spi/spi-bcm2835.c | |
parent | 2ef2e60d2f4d470b0cb591baeaf942316c0673ed (diff) | |
parent | db9371b853e7cebce93f0775215ef297b8d0bf93 (diff) | |
download | linux-fsl-qoriq-52d85ebb7b639448e596a8577bf981f5b139f4fd.tar.xz |
Merge remote-tracking branch 'spi/topic/bfin' into spi-next
Diffstat (limited to 'drivers/spi/spi-bcm2835.c')
-rw-r--r-- | drivers/spi/spi-bcm2835.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/spi/spi-bcm2835.c b/drivers/spi/spi-bcm2835.c index 52c8148..4c33214 100644 --- a/drivers/spi/spi-bcm2835.c +++ b/drivers/spi/spi-bcm2835.c @@ -358,7 +358,7 @@ static int bcm2835_spi_probe(struct platform_device *pdev) bcm2835_wr(bs, BCM2835_SPI_CS, BCM2835_SPI_CS_CLEAR_RX | BCM2835_SPI_CS_CLEAR_TX); - err = spi_register_master(master); + err = devm_spi_register_master(&pdev->dev, master); if (err) { dev_err(&pdev->dev, "could not register SPI master: %d\n", err); goto out_free_irq; @@ -381,14 +381,12 @@ static int bcm2835_spi_remove(struct platform_device *pdev) struct bcm2835_spi *bs = spi_master_get_devdata(master); free_irq(bs->irq, master); - spi_unregister_master(master); /* Clear FIFOs, and disable the HW block */ bcm2835_wr(bs, BCM2835_SPI_CS, BCM2835_SPI_CS_CLEAR_RX | BCM2835_SPI_CS_CLEAR_TX); clk_disable_unprepare(bs->clk); - spi_master_put(master); return 0; } |