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

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

spi: bcm2835: 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 5afd077d

drivers/spi/spi-bcm2835.c

+1 −3
Original line number Diff line number Diff line
@@ -358,7 +358,7 @@ static int bcm2835_spi_probe(struct platform_device *pdev) 
	bcm2835_wr(bs, BCM2835_SPI_CS,

		   BCM2835_SPI_CS_CLEAR_RX | BCM2835_SPI_CS_CLEAR_TX);



	err = spi_register_master(master);

	err = devm_spi_register_master(&pdev->dev, master);

	if (err) {

		dev_err(&pdev->dev, "could not register SPI master: %d\n", err);

		goto out_free_irq;
@@ -381,14 +381,12 @@ static int bcm2835_spi_remove(struct platform_device *pdev) 
	struct bcm2835_spi *bs = spi_master_get_devdata(master);



	free_irq(bs->irq, master);

	spi_unregister_master(master);



	/* Clear FIFOs, and disable the HW block */

	bcm2835_wr(bs, BCM2835_SPI_CS,

		   BCM2835_SPI_CS_CLEAR_RX | BCM2835_SPI_CS_CLEAR_TX);



	clk_disable_unprepare(bs->clk);

	spi_master_put(master);



	return 0;

}