diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-07 12:02:26 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-07 12:02:26 +0100 |
| commit | dabefd56c6ee883bae0bdce4d5396c3f21286ab8 (patch) | |
| tree | 2f629a4cfa71276b4afe947232f934f9b0887e7d /drivers/spi/spi-bcm63xx.c | |
| parent | 3b3a80019ff194e86e740ec2f013a8915efd1ccf (diff) | |
| parent | 2fe7e4add3e53df7c1b97e32076f8390dd81c6b3 (diff) | |
Merge remote-tracking branch 'spi/topic/devm' into spi-qspi
Conflicts:
drivers/spi/spi-ti-qspi.c
Diffstat (limited to 'drivers/spi/spi-bcm63xx.c')
| -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 536b0e36382..80d56b214eb 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; } |