diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2023-05-28 21:58:28 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-05-30 14:47:01 +0200 |
| commit | 5363073dfcf087393c0587e9217ef50b1d63fcce (patch) | |
| tree | 78bc75403fa961cc4faadff69185b723de2d75de /drivers/spi/spi-sn-f-ospi.c | |
| parent | spi: Switch i2c drivers back to use .probe() (diff) | |
| download | linux-5363073dfcf087393c0587e9217ef50b1d63fcce.tar.xz linux-5363073dfcf087393c0587e9217ef50b1d63fcce.zip | |
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>
Diffstat (limited to 'drivers/spi/spi-sn-f-ospi.c')
| -rw-r--r-- | drivers/spi/spi-sn-f-ospi.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/spi/spi-sn-f-ospi.c b/drivers/spi/spi-sn-f-ospi.c index a2bd9dcde075..39c4df54cdb8 100644 --- a/drivers/spi/spi-sn-f-ospi.c +++ b/drivers/spi/spi-sn-f-ospi.c @@ -634,18 +634,12 @@ static int f_ospi_probe(struct platform_device *pdev) goto err_put_ctlr; } - ospi->clk = devm_clk_get(dev, NULL); + ospi->clk = devm_clk_get_enabled(dev, NULL); if (IS_ERR(ospi->clk)) { ret = PTR_ERR(ospi->clk); goto err_put_ctlr; } - ret = clk_prepare_enable(ospi->clk); - if (ret) { - dev_err(dev, "Failed to enable the clock\n"); - goto err_disable_clk; - } - mutex_init(&ospi->mlock); ret = f_ospi_init(ospi); @@ -661,9 +655,6 @@ static int f_ospi_probe(struct platform_device *pdev) err_destroy_mutex: mutex_destroy(&ospi->mlock); -err_disable_clk: - clk_disable_unprepare(ospi->clk); - err_put_ctlr: spi_controller_put(ctlr); @@ -674,8 +665,6 @@ static void f_ospi_remove(struct platform_device *pdev) { struct f_ospi *ospi = platform_get_drvdata(pdev); - clk_disable_unprepare(ospi->clk); - mutex_destroy(&ospi->mlock); } |