spi: pic32-sqi: Use helper function devm_clk_get_enabled()
Since commit 7ef9651e97
("clk: Provide new devm_clk helpers for prepared
and enabled clocks"), devm_clk_get() and clk_prepare_enable() can now be
replaced by devm_clk_get_enabled() when driver enables (and possibly
prepares) the clocks for the whole lifetime of the device. Moreover, it is
no longer necessary to unprepare and disable the clocks explicitly.
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Li Zetao <lizetao1@huawei.com>
Link: https://lore.kernel.org/r/20230823133938.1359106-23-lizetao1@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
bbd0a66b85
commit
909d4cd6bc
@ -593,33 +593,20 @@ static int pic32_sqi_probe(struct platform_device *pdev)
|
||||
}
|
||||
|
||||
/* clocks */
|
||||
sqi->sys_clk = devm_clk_get(&pdev->dev, "reg_ck");
|
||||
sqi->sys_clk = devm_clk_get_enabled(&pdev->dev, "reg_ck");
|
||||
if (IS_ERR(sqi->sys_clk)) {
|
||||
ret = PTR_ERR(sqi->sys_clk);
|
||||
dev_err(&pdev->dev, "no sys_clk ?\n");
|
||||
goto err_free_host;
|
||||
}
|
||||
|
||||
sqi->base_clk = devm_clk_get(&pdev->dev, "spi_ck");
|
||||
sqi->base_clk = devm_clk_get_enabled(&pdev->dev, "spi_ck");
|
||||
if (IS_ERR(sqi->base_clk)) {
|
||||
ret = PTR_ERR(sqi->base_clk);
|
||||
dev_err(&pdev->dev, "no base clk ?\n");
|
||||
goto err_free_host;
|
||||
}
|
||||
|
||||
ret = clk_prepare_enable(sqi->sys_clk);
|
||||
if (ret) {
|
||||
dev_err(&pdev->dev, "sys clk enable failed\n");
|
||||
goto err_free_host;
|
||||
}
|
||||
|
||||
ret = clk_prepare_enable(sqi->base_clk);
|
||||
if (ret) {
|
||||
dev_err(&pdev->dev, "base clk enable failed\n");
|
||||
clk_disable_unprepare(sqi->sys_clk);
|
||||
goto err_free_host;
|
||||
}
|
||||
|
||||
init_completion(&sqi->xfer_done);
|
||||
|
||||
/* initialize hardware */
|
||||
@ -629,7 +616,7 @@ static int pic32_sqi_probe(struct platform_device *pdev)
|
||||
ret = ring_desc_ring_alloc(sqi);
|
||||
if (ret) {
|
||||
dev_err(&pdev->dev, "ring alloc failed\n");
|
||||
goto err_disable_clk;
|
||||
goto err_free_host;
|
||||
}
|
||||
|
||||
/* install irq handlers */
|
||||
@ -669,10 +656,6 @@ static int pic32_sqi_probe(struct platform_device *pdev)
|
||||
err_free_ring:
|
||||
ring_desc_ring_free(sqi);
|
||||
|
||||
err_disable_clk:
|
||||
clk_disable_unprepare(sqi->base_clk);
|
||||
clk_disable_unprepare(sqi->sys_clk);
|
||||
|
||||
err_free_host:
|
||||
spi_controller_put(host);
|
||||
return ret;
|
||||
@ -685,10 +668,6 @@ static void pic32_sqi_remove(struct platform_device *pdev)
|
||||
/* release resources */
|
||||
free_irq(sqi->irq, sqi);
|
||||
ring_desc_ring_free(sqi);
|
||||
|
||||
/* disable clk */
|
||||
clk_disable_unprepare(sqi->base_clk);
|
||||
clk_disable_unprepare(sqi->sys_clk);
|
||||
}
|
||||
|
||||
static const struct of_device_id pic32_sqi_of_ids[] = {
|
||||
|
Loading…
Reference in New Issue
Block a user