Unverified Commit ea0e916d authored by Pei Xiao's avatar Pei Xiao Committed by Mark Brown
Browse files

spi: sunplus-sp7021: Simplify clock handling with devm_clk_get_enabled() 



Replace devm_clk_get() followed by clk_prepare_enable() with
devm_clk_get_enabled() for the clock. This removes the need for
explicit clock enable/disable calls and the custom cleanup function,
as the managed API automatically handles clock disabling on device
removal or probe failure.

Remove the now-unnecessary sp7021_spi_disable_unprepare() function
and the devm_add_action_or_reset() call.

Signed-off-by: default avatarPei Xiao <xiaopei01@kylinos.cn>
Link: https://patch.msgid.link/fb0bc46107975cfff4eefa9ba96fe7545996ae52.1773885292.git.xiaopei01@kylinos.cn


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 7da63780

drivers/spi/spi-sunplus-sp7021.c

+1 −14
Original line number Diff line number Diff line
@@ -389,11 +389,6 @@ static int sp7021_spi_target_transfer_one(struct spi_controller *ctlr, struct sp 
	return ret;

}



static void sp7021_spi_disable_unprepare(void *data)

{

	clk_disable_unprepare(data);

}



static void sp7021_spi_reset_control_assert(void *data)

{

	reset_control_assert(data);
@@ -460,7 +455,7 @@ static int sp7021_spi_controller_probe(struct platform_device *pdev) 
	if (pspim->s_irq < 0)

		return pspim->s_irq;



	pspim->spi_clk = devm_clk_get(dev, NULL);

	pspim->spi_clk = devm_clk_get_enabled(dev, NULL);

	if (IS_ERR(pspim->spi_clk))

		return dev_err_probe(dev, PTR_ERR(pspim->spi_clk), "clk get fail\n");
@@ -468,14 +463,6 @@ static int sp7021_spi_controller_probe(struct platform_device *pdev) 
	if (IS_ERR(pspim->rstc))

		return dev_err_probe(dev, PTR_ERR(pspim->rstc), "rst get fail\n");



	ret = clk_prepare_enable(pspim->spi_clk);

	if (ret)

		return dev_err_probe(dev, ret, "failed to enable clk\n");



	ret = devm_add_action_or_reset(dev, sp7021_spi_disable_unprepare, pspim->spi_clk);

	if (ret)

		return ret;



	ret = reset_control_deassert(pspim->rstc);

	if (ret)

		return dev_err_probe(dev, ret, "failed to deassert reset\n");