]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ASoC: codecs: Use devm_clk_get_enabled() helpers
authorying zuxin <11154159@vivo.com>
Fri, 6 Sep 2024 08:48:31 +0000 (16:48 +0800)
committerMark Brown <broonie@kernel.org>
Fri, 6 Sep 2024 14:55:41 +0000 (15:55 +0100)
The devm_clk_get_enabled() helpers:
    - call devm_clk_get()
    - call clk_prepare_enable() and register what is needed in order to
     call clk_disable_unprepare() when needed, as a managed resource.

This simplifies the code and avoids the calls to clk_disable_unprepare().

Signed-off-by: ying zuxin <11154159@vivo.com>
Link: https://patch.msgid.link/20240906084841.19248-1-yingzuxin@vivo.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/peb2466.c

index 76ee7e3f4d9b9b8ac8a59cebe946b90c81c37755..b67cfad4fc32858c98c5b00b65156902018c750f 100644 (file)
@@ -1975,12 +1975,9 @@ static int peb2466_spi_probe(struct spi_device *spi)
        if (IS_ERR(peb2466->reset_gpio))
                return PTR_ERR(peb2466->reset_gpio);
 
-       peb2466->mclk = devm_clk_get(&peb2466->spi->dev, "mclk");
+       peb2466->mclk = devm_clk_get_enabled(&peb2466->spi->dev, "mclk");
        if (IS_ERR(peb2466->mclk))
                return PTR_ERR(peb2466->mclk);
-       ret = clk_prepare_enable(peb2466->mclk);
-       if (ret)
-               return ret;
 
        if (peb2466->reset_gpio) {
                gpiod_set_value_cansleep(peb2466->reset_gpio, 1);
@@ -2031,17 +2028,9 @@ static int peb2466_spi_probe(struct spi_device *spi)
        return 0;
 
 failed:
-       clk_disable_unprepare(peb2466->mclk);
        return ret;
 }
 
-static void peb2466_spi_remove(struct spi_device *spi)
-{
-       struct peb2466 *peb2466 = spi_get_drvdata(spi);
-
-       clk_disable_unprepare(peb2466->mclk);
-}
-
 static const struct of_device_id peb2466_of_match[] = {
        { .compatible = "infineon,peb2466", },
        { }
@@ -2061,7 +2050,6 @@ static struct spi_driver peb2466_spi_driver = {
        },
        .id_table = peb2466_id_table,
        .probe  = peb2466_spi_probe,
-       .remove = peb2466_spi_remove,
 };
 
 module_spi_driver(peb2466_spi_driver);