Skip to content

Commit 6b6cc88

Browse files
Li Zetaobroonie
authored andcommitted
spi: pic32: 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 <[email protected]> Signed-off-by: Li Zetao <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent 909d4cd commit 6b6cc88

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

drivers/spi/spi-pic32.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -730,17 +730,13 @@ static int pic32_spi_hw_probe(struct platform_device *pdev,
730730
return pic32s->tx_irq;
731731

732732
/* get clock */
733-
pic32s->clk = devm_clk_get(&pdev->dev, "mck0");
733+
pic32s->clk = devm_clk_get_enabled(&pdev->dev, "mck0");
734734
if (IS_ERR(pic32s->clk)) {
735735
dev_err(&pdev->dev, "clk not found\n");
736736
ret = PTR_ERR(pic32s->clk);
737737
goto err_unmap_mem;
738738
}
739739

740-
ret = clk_prepare_enable(pic32s->clk);
741-
if (ret)
742-
goto err_unmap_mem;
743-
744740
pic32_spi_hw_init(pic32s);
745741

746742
return 0;
@@ -837,7 +833,6 @@ static int pic32_spi_probe(struct platform_device *pdev)
837833

838834
err_bailout:
839835
pic32_spi_dma_unprep(pic32s);
840-
clk_disable_unprepare(pic32s->clk);
841836
err_host:
842837
spi_controller_put(host);
843838
return ret;
@@ -849,7 +844,6 @@ static void pic32_spi_remove(struct platform_device *pdev)
849844

850845
pic32s = platform_get_drvdata(pdev);
851846
pic32_spi_disable(pic32s);
852-
clk_disable_unprepare(pic32s->clk);
853847
pic32_spi_dma_unprep(pic32s);
854848
}
855849

0 commit comments

Comments
 (0)