Skip to content

Commit 5363073

Browse files
larsclausenbroonie
authored andcommitted
spi: spi-sn-f-ospi: Use devm_clk_get_enabled()
Replace the combination of devm_clk_get_enable() plus clk_prepare_enable() with devm_clk_get_enabled(). Slightly reduces the amount of boilerplate code. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Link: https://lore.kernel.org/r/20230528195830.164669-1-lars@metafoo.de Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 3e39448 commit 5363073

1 file changed

Lines changed: 1 addition & 12 deletions

File tree

drivers/spi/spi-sn-f-ospi.c

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -634,18 +634,12 @@ static int f_ospi_probe(struct platform_device *pdev)
634634
goto err_put_ctlr;
635635
}
636636

637-
ospi->clk = devm_clk_get(dev, NULL);
637+
ospi->clk = devm_clk_get_enabled(dev, NULL);
638638
if (IS_ERR(ospi->clk)) {
639639
ret = PTR_ERR(ospi->clk);
640640
goto err_put_ctlr;
641641
}
642642

643-
ret = clk_prepare_enable(ospi->clk);
644-
if (ret) {
645-
dev_err(dev, "Failed to enable the clock\n");
646-
goto err_disable_clk;
647-
}
648-
649643
mutex_init(&ospi->mlock);
650644

651645
ret = f_ospi_init(ospi);
@@ -661,9 +655,6 @@ static int f_ospi_probe(struct platform_device *pdev)
661655
err_destroy_mutex:
662656
mutex_destroy(&ospi->mlock);
663657

664-
err_disable_clk:
665-
clk_disable_unprepare(ospi->clk);
666-
667658
err_put_ctlr:
668659
spi_controller_put(ctlr);
669660

@@ -674,8 +665,6 @@ static void f_ospi_remove(struct platform_device *pdev)
674665
{
675666
struct f_ospi *ospi = platform_get_drvdata(pdev);
676667

677-
clk_disable_unprepare(ospi->clk);
678-
679668
mutex_destroy(&ospi->mlock);
680669
}
681670

0 commit comments

Comments
 (0)