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

Commit 2198b748 authored by Shubhrajyoti Datta's avatar Shubhrajyoti Datta Committed by Mark Brown
Browse files

spi: cadence: Remove the clock enable and disable from suspend and resume 



Now that the clocks are enabled and disabled per transaction
, remove the clock enable and disable from resume and suspend
hooks.

Signed-off-by: default avatarShubhrajyoti Datta <shubhraj@xilinx.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent d36ccd9f

drivers/spi/spi-cadence.c

+0 −19
Original line number Original line Diff line number Diff line
@@ -621,14 +621,9 @@ static int __maybe_unused cdns_spi_suspend(struct device *dev) 
{

{

	struct platform_device *pdev = to_platform_device(dev);

	struct platform_device *pdev = to_platform_device(dev);

	struct spi_master *master = platform_get_drvdata(pdev);

	struct spi_master *master = platform_get_drvdata(pdev);

	struct cdns_spi *xspi = spi_master_get_devdata(master);





	spi_master_suspend(master);

	spi_master_suspend(master);





	clk_disable_unprepare(xspi->ref_clk);



	clk_disable_unprepare(xspi->pclk);



	return 0;

	return 0;

}

}
@@ -644,21 +639,7 @@ static int __maybe_unused cdns_spi_resume(struct device *dev) 
{

{

	struct platform_device *pdev = to_platform_device(dev);

	struct platform_device *pdev = to_platform_device(dev);

	struct spi_master *master = platform_get_drvdata(pdev);

	struct spi_master *master = platform_get_drvdata(pdev);

	struct cdns_spi *xspi = spi_master_get_devdata(master);

	int ret = 0;



	ret = clk_prepare_enable(xspi->pclk);

	if (ret) {

		dev_err(dev, "Cannot enable APB clock.\n");

		return ret;

	}





	ret = clk_prepare_enable(xspi->ref_clk);

	if (ret) {

		dev_err(dev, "Cannot enable device clock.\n");

		clk_disable(xspi->pclk);

		return ret;

	}

	spi_master_resume(master);

	spi_master_resume(master);





	return 0;

	return 0;