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

Commit 5c32d29f authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mark Brown
Browse files

spi: sh-msiof: Convert to clk_prepare/unprepare 



Get the driver ready for the migration to the common clock framework by
calling clk_prepare() and clk_unprepare(). The calls are added in the
probe and remove handlers as the clk_enable() and clk_disable() calls
are located in atomic context and there's no callback function in
non-atomic context that can be used to prepare/unprepare the clock.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent b4dd05de

drivers/spi/spi-sh-msiof.c

+8 −0
Original line number Diff line number Diff line
@@ -682,6 +682,12 @@ static int sh_msiof_spi_probe(struct platform_device *pdev) 
		goto err1;

	}



	ret = clk_prepare(p->clk);

	if (ret < 0) {

		dev_err(&pdev->dev, "unable to prepare clock\n");

		goto err1;

	}



	p->pdev = pdev;

	pm_runtime_enable(&pdev->dev);
@@ -718,6 +724,7 @@ static int sh_msiof_spi_probe(struct platform_device *pdev) 
		return 0;



	pm_runtime_disable(&pdev->dev);

	clk_unprepare(p->clk);

 err1:

	spi_master_put(master);

	return ret;
@@ -731,6 +738,7 @@ static int sh_msiof_spi_remove(struct platform_device *pdev) 
	ret = spi_bitbang_stop(&p->bitbang);

	if (!ret) {

		pm_runtime_disable(&pdev->dev);

		clk_unprepare(p->clk);

		spi_master_put(p->bitbang.master);

	}

	return ret;