diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2013-12-17 21:44:47 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-12-17 22:32:17 +0000 |
| commit | 7d255695804fbe7b2c30bcd54c1faf1d0918443c (patch) | |
| tree | 2cb92a8e0191521bdd910dfe8e5e4393d4d02598 /drivers | |
| parent | dea5de1b37c08bc8a028b6a53145b7594ba6eb31 (diff) | |
spi/bcm63xx-hsspi: use devm_register_master()
Simplifies the remove call.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/spi/spi-bcm63xx-hsspi.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/spi/spi-bcm63xx-hsspi.c b/drivers/spi/spi-bcm63xx-hsspi.c index 949dfb57fe89..1721ea99d688 100644 --- a/drivers/spi/spi-bcm63xx-hsspi.c +++ b/drivers/spi/spi-bcm63xx-hsspi.c @@ -399,7 +399,7 @@ static int bcm63xx_hsspi_probe(struct platform_device *pdev) goto out_put_master; /* register and we are done */ - ret = spi_register_master(master); + ret = devm_spi_register_master(dev, master); if (ret) goto out_put_master; @@ -418,8 +418,6 @@ static int bcm63xx_hsspi_remove(struct platform_device *pdev) struct spi_master *master = platform_get_drvdata(pdev); struct bcm63xx_hsspi *bs = spi_master_get_devdata(master); - spi_unregister_master(master); - /* reset the hardware and block queue progress */ __raw_writel(0, bs->regs + HSSPI_INT_MASK_REG); clk_disable_unprepare(bs->clk); |