diff options
| author | Jinjie Ruan <ruanjinjie@huawei.com> | 2023-08-25 18:57:44 +0800 |
|---|---|---|
| committer | Jonathan Cameron <Jonathan.Cameron@huawei.com> | 2023-09-11 20:12:39 +0100 |
| commit | a3e9625ec0c523cba3847ae21c382ae745e71d19 (patch) | |
| tree | d9a15e68302482cb6007eb37b31f1915e773c02c /drivers | |
| parent | 0bb80ecc33a8fb5a682236443c1e740d5c917d1d (diff) | |
| download | linux-stable-a3e9625ec0c523cba3847ae21c382ae745e71d19.tar.gz linux-stable-a3e9625ec0c523cba3847ae21c382ae745e71d19.tar.bz2 linux-stable-a3e9625ec0c523cba3847ae21c382ae745e71d19.zip | |
iio: adc: mt6577_auxadc: Use devm_clk_get_enabled() helper function
The devm_clk_get_enabled() helper:
- calls devm_clk_get()
- calls clk_prepare_enable() and registers what is needed in order to
call clk_disable_unprepare() when needed, as a managed resource.
This simplifies the code.
Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>
Link: https://lore.kernel.org/r/20230825105746.2999548-3-ruanjinjie@huawei.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/iio/adc/mt6577_auxadc.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/drivers/iio/adc/mt6577_auxadc.c b/drivers/iio/adc/mt6577_auxadc.c index 0e134777bdd2..ea42fd7a8c99 100644 --- a/drivers/iio/adc/mt6577_auxadc.c +++ b/drivers/iio/adc/mt6577_auxadc.c @@ -270,23 +270,16 @@ static int mt6577_auxadc_probe(struct platform_device *pdev) return PTR_ERR(adc_dev->reg_base); } - adc_dev->adc_clk = devm_clk_get(&pdev->dev, "main"); + adc_dev->adc_clk = devm_clk_get_enabled(&pdev->dev, "main"); if (IS_ERR(adc_dev->adc_clk)) { - dev_err(&pdev->dev, "failed to get auxadc clock\n"); - return PTR_ERR(adc_dev->adc_clk); - } - - ret = clk_prepare_enable(adc_dev->adc_clk); - if (ret) { dev_err(&pdev->dev, "failed to enable auxadc clock\n"); - return ret; + return PTR_ERR(adc_dev->adc_clk); } adc_clk_rate = clk_get_rate(adc_dev->adc_clk); if (!adc_clk_rate) { - ret = -EINVAL; dev_err(&pdev->dev, "null clock rate\n"); - goto err_disable_clk; + return -EINVAL; } adc_dev->dev_comp = device_get_match_data(&pdev->dev); @@ -310,8 +303,6 @@ static int mt6577_auxadc_probe(struct platform_device *pdev) err_power_off: mt6577_auxadc_mod_reg(adc_dev->reg_base + MT6577_AUXADC_MISC, 0, MT6577_AUXADC_PDN_EN); -err_disable_clk: - clk_disable_unprepare(adc_dev->adc_clk); return ret; } @@ -325,8 +316,6 @@ static int mt6577_auxadc_remove(struct platform_device *pdev) mt6577_auxadc_mod_reg(adc_dev->reg_base + MT6577_AUXADC_MISC, 0, MT6577_AUXADC_PDN_EN); - clk_disable_unprepare(adc_dev->adc_clk); - return 0; } |