| Message ID | 20230825105746.2999548-3-ruanjinjie@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | iio: Use devm_clk_get_enabled() helper function | expand |
On Fri, 25 Aug 2023 18:57:44 +0800 Jinjie Ruan <ruanjinjie@huawei.com> wrote: > 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> Applied. This is another case that would benefit from use of dev_err_probe() for all error messages in the probe routine. Should also be easy to convert to fully devm managed with one devm_add_action_or_reset() and appropriate callback. Jonathan > --- > drivers/iio/adc/mt6577_auxadc.c | 17 +++-------------- > 1 file 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; > } >
On 2023/8/25 20:54, Jonathan Cameron wrote: > On Fri, 25 Aug 2023 18:57:44 +0800 > Jinjie Ruan <ruanjinjie@huawei.com> wrote: > >> 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> > > Applied. This is another case that would benefit from use of dev_err_probe() > for all error messages in the probe routine. Should also be easy to convert > to fully devm managed with one devm_add_action_or_reset() and appropriate > callback. Right! Use dev_err_probe() to simplify it is a good idea. > > Jonathan > >> --- >> drivers/iio/adc/mt6577_auxadc.c | 17 +++-------------- >> 1 file 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; >> } >> >
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; }
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> --- drivers/iio/adc/mt6577_auxadc.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-)