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

Commit 1ae4ec14 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Mark Brown
Browse files

spi: spi-txx9: Add missing clock (un)prepare calls for CCF 



While the custom minimal TXx9 clock implementation doesn't need or use
clock (un)prepare calls (they are dummies if !CONFIG_HAVE_CLK_PREPARE),
they are mandatory when using the Common Clock Framework.

Hence add them, to prepare for the advent of CCF.

Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 29b4817d

drivers/spi/spi-txx9.c

+3 −3
Original line number Diff line number Diff line
@@ -346,7 +346,7 @@ static int txx9spi_probe(struct platform_device *dev) 
		c->clk = NULL;

		goto exit;

	}

	ret = clk_enable(c->clk);

	ret = clk_prepare_enable(c->clk);

	if (ret) {

		c->clk = NULL;

		goto exit;
@@ -395,7 +395,7 @@ static int txx9spi_probe(struct platform_device *dev) 
exit_busy:

	ret = -EBUSY;

exit:

	clk_disable(c->clk);

	clk_disable_unprepare(c->clk);

	spi_master_put(master);

	return ret;

}
@@ -406,7 +406,7 @@ static int txx9spi_remove(struct platform_device *dev) 
	struct txx9spi *c = spi_master_get_devdata(master);



	flush_work(&c->work);

	clk_disable(c->clk);

	clk_disable_unprepare(c->clk);

	return 0;

}