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>

diff --git a/drivers/spi/spi-bcm63xx-hsspi.c b/drivers/spi/spi-bcm63xx-hsspi.c
index 949dfb57fe89c93dabe61b3d072fba8307b97981..1721ea99d68849356672a1ef13ca1dc23a3a51f3 100644 (file)
--- 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);