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

Commit 91800f0e authored by Mark Brown's avatar Mark Brown
Browse files

spi/s3c64xx: Use managed registration 



Also improve the error reporting on failure and remove a duplicate put.
This provides a small code saving.

Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent fbce71ca

drivers/spi/spi-s3c64xx.c

+3 −7
Original line number Original line Diff line number Diff line
@@ -1428,9 +1428,9 @@ static int s3c64xx_spi_probe(struct platform_device *pdev) 
	       S3C64XX_SPI_INT_TX_OVERRUN_EN | S3C64XX_SPI_INT_TX_UNDERRUN_EN,

	       S3C64XX_SPI_INT_TX_OVERRUN_EN | S3C64XX_SPI_INT_TX_UNDERRUN_EN,

	       sdd->regs + S3C64XX_SPI_INT_EN);

	       sdd->regs + S3C64XX_SPI_INT_EN);





	if (spi_register_master(master)) {

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

		dev_err(&pdev->dev, "cannot register SPI master\n");

	if (ret != 0) {

		ret = -EBUSY;

		dev_err(&pdev->dev, "cannot register SPI master: %d\n", ret);

		goto err3;

		goto err3;

	}

	}
@@ -1461,16 +1461,12 @@ static int s3c64xx_spi_remove(struct platform_device *pdev) 




	pm_runtime_disable(&pdev->dev);

	pm_runtime_disable(&pdev->dev);





	spi_unregister_master(master);



	writel(0, sdd->regs + S3C64XX_SPI_INT_EN);

	writel(0, sdd->regs + S3C64XX_SPI_INT_EN);





	clk_disable_unprepare(sdd->src_clk);

	clk_disable_unprepare(sdd->src_clk);





	clk_disable_unprepare(sdd->clk);

	clk_disable_unprepare(sdd->clk);





	spi_master_put(master);



	return 0;

	return 0;

}

}