From: Jonas Gorski Date: Tue, 17 Dec 2013 20:44:47 +0000 (+0100) Subject: spi/bcm63xx-hsspi: use devm_register_master() X-Git-Tag: v3.14-rc1~91^2~4^4~1 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=7d255695804fbe7b2c30bcd54c1faf1d0918443c;p=linux.git spi/bcm63xx-hsspi: use devm_register_master() Simplifies the remove call. Signed-off-by: Jonas Gorski Signed-off-by: Mark Brown --- 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);