diff options
| author | Mark Brown <broonie@kernel.org> | 2020-05-30 00:03:51 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-05-30 00:03:51 +0100 |
| commit | 0c0c5b8fabe596a7322f0b9b93b88f489b3f4bb3 (patch) | |
| tree | b137f835d2b336cbb68977ca16169b8f1ed14286 /drivers/spi/spi-bcm2835.c | |
| parent | 9cb1fd0efd195590b828b9b865421ad345a4a145 (diff) | |
| parent | 65e318e17358a3fd4fcb5a69d89b14016dee2f06 (diff) | |
Merge remote-tracking branch 'spi/for-5.7' into spi-linus
Diffstat (limited to 'drivers/spi/spi-bcm2835.c')
| -rw-r--r-- | drivers/spi/spi-bcm2835.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/spi/spi-bcm2835.c b/drivers/spi/spi-bcm2835.c index 11c235879bb7..fd887a6492f4 100644 --- a/drivers/spi/spi-bcm2835.c +++ b/drivers/spi/spi-bcm2835.c @@ -1347,7 +1347,7 @@ static int bcm2835_spi_probe(struct platform_device *pdev) goto out_dma_release; } - err = devm_spi_register_controller(&pdev->dev, ctlr); + err = spi_register_controller(ctlr); if (err) { dev_err(&pdev->dev, "could not register SPI controller: %d\n", err); @@ -1374,6 +1374,8 @@ static int bcm2835_spi_remove(struct platform_device *pdev) bcm2835_debugfs_remove(bs); + spi_unregister_controller(ctlr); + /* Clear FIFOs, and disable the HW block */ bcm2835_wr(bs, BCM2835_SPI_CS, BCM2835_SPI_CS_CLEAR_RX | BCM2835_SPI_CS_CLEAR_TX); |