Skip to content

Commit 605204f

Browse files
Li Zetaobroonie
authored andcommitted
spi: microchip-core: Use helper function devm_clk_get_enabled()
Since commit 7ef9651 ("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-19-lizetao1@huawei.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent e922f3f commit 605204f

1 file changed

Lines changed: 1 addition & 8 deletions

File tree

drivers/spi/spi-microchip-core.c

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -539,22 +539,16 @@ static int mchp_corespi_probe(struct platform_device *pdev)
539539
return dev_err_probe(&pdev->dev, ret,
540540
"could not request irq\n");
541541

542-
spi->clk = devm_clk_get(&pdev->dev, NULL);
542+
spi->clk = devm_clk_get_enabled(&pdev->dev, NULL);
543543
if (IS_ERR(spi->clk))
544544
return dev_err_probe(&pdev->dev, PTR_ERR(spi->clk),
545545
"could not get clk\n");
546546

547-
ret = clk_prepare_enable(spi->clk);
548-
if (ret)
549-
return dev_err_probe(&pdev->dev, ret,
550-
"failed to enable clock\n");
551-
552547
mchp_corespi_init(master, spi);
553548

554549
ret = devm_spi_register_master(&pdev->dev, master);
555550
if (ret) {
556551
mchp_corespi_disable(spi);
557-
clk_disable_unprepare(spi->clk);
558552
return dev_err_probe(&pdev->dev, ret,
559553
"unable to register master for SPI controller\n");
560554
}
@@ -570,7 +564,6 @@ static void mchp_corespi_remove(struct platform_device *pdev)
570564
struct mchp_corespi *spi = spi_master_get_devdata(master);
571565

572566
mchp_corespi_disable_ints(spi);
573-
clk_disable_unprepare(spi->clk);
574567
mchp_corespi_disable(spi);
575568
}
576569

0 commit comments

Comments
 (0)