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

Commit bca76931 authored by Jingoo Han's avatar Jingoo Han Committed by Mark Brown
Browse files

spi: bcm63xx: use devm_spi_register_master() 



Use devm_spi_register_master() to make cleanup paths simpler,
and remove a duplicate put.

Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 247263db

drivers/spi/spi-bcm63xx.c

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

}