Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d255695 authored by Jonas Gorski's avatar Jonas Gorski Committed by Mark Brown
Browse files

spi/bcm63xx-hsspi: use devm_register_master() 



Simplifies the remove call.

Signed-off-by: default avatarJonas Gorski <jogo@openwrt.org>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent dea5de1b

drivers/spi/spi-bcm63xx-hsspi.c

+1 −3
Original line number Diff line number Diff line
@@ -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);