Re: [PATCH v8 03/16] hwmon: Make use of devm_clk_get_enabled()

Guenter Roeck
2022-03-15T23:49:56Z

On 3/14/22 07:16, Uwe Kleine-König wrote:
> Several drivers manually register a devm handler to disable their clk.
> Convert them to devm_clk_get_enabled().
>
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Let's see if it goes anywhere this time.

Acked-by: Guenter Roeck <linux@roeck-us.net>

> ---
> drivers/hwmon/axi-fan-control.c | 15 +--------------
> drivers/hwmon/ltc2947-core.c | 17 +----------------
> drivers/hwmon/mr75203.c | 26 +-------------------------
> drivers/hwmon/sparx5-temp.c | 19 +------------------
> 4 files changed, 4 insertions(+), 73 deletions(-)
>
> diff --git a/drivers/hwmon/axi-fan-control.c b/drivers/hwmon/axi-fan-control.c
> index d2092c17d993..ce404ed9c53e 100644
> --- a/drivers/hwmon/axi-fan-control.c
> +++ b/drivers/hwmon/axi-fan-control.c
> @@ -393,11 +393,6 @@ static int axi_fan_control_init(struct axi_fan_control_data *ctl,
> return ret;
> }
>
> -static void axi_fan_control_clk_disable(void *clk)
> -{
> - clk_disable_unprepare(clk);
> -}
> -
> static const struct hwmon_channel_info *axi_fan_control_info[] = {
> HWMON_CHANNEL_INFO(pwm, HWMON_PWM_INPUT),
> HWMON_CHANNEL_INFO(fan, HWMON_F_INPUT | HWMON_F_FAULT | HWMON_F_LABEL),
> @@ -477,20 +472,12 @@ static int axi_fan_control_probe(struct platform_device *pdev)
> if (IS_ERR(ctl->base))
> return PTR_ERR(ctl->base);
>
> - clk = devm_clk_get(&pdev->dev, NULL);
> + clk = devm_clk_get_enabled(&pdev->dev, NULL);
> if (IS_ERR(clk)) {
> dev_err(&pdev->dev, "clk_get failed with %ld\n", PTR_ERR(clk));
> return PTR_ERR(clk);
> }
>
> - ret = clk_prepare_enable(clk);
> - if (ret)
> - return ret;
> -
> - ret = devm_add_action_or_reset(&pdev->dev, axi_fan_control_clk_disable, clk);
> - if (ret)
> - return ret;
> -
> ctl->clk_rate = clk_get_rate(clk);
> if (!ctl->clk_rate)
> return -EINVAL;
> diff --git a/drivers/hwmon/ltc2947-core.c b/drivers/hwmon/ltc2947-core.c
> index 5423466de697..626f5bf2c9c7 100644
> --- a/drivers/hwmon/ltc2947-core.c
> +++ b/drivers/hwmon/ltc2947-core.c
> @@ -956,13 +956,6 @@ static struct attribute *ltc2947_attrs[] = {
> };
> ATTRIBUTE_GROUPS(ltc2947);
>
> -static void ltc2947_clk_disable(void *data)
> -{
> - struct clk *extclk = data;
> -
> - clk_disable_unprepare(extclk);
> -}
> -
> static int ltc2947_setup(struct ltc2947_data *st)
> {
> int ret;
> @@ -989,7 +982,7 @@ static int ltc2947_setup(struct ltc2947_data *st)
> return ret;
>
> /* check external clock presence */
> - extclk = devm_clk_get_optional(st->dev, NULL);
> + extclk = devm_clk_get_optional_enabled(st->dev, NULL);
> if (IS_ERR(extclk))
> return dev_err_probe(st->dev, PTR_ERR(extclk),
> "Failed to get external clock\n");
> @@ -1007,14 +1000,6 @@ static int ltc2947_setup(struct ltc2947_data *st)
> return -EINVAL;
> }
>
> - ret = clk_prepare_enable(extclk);
> - if (ret)
> - return ret;
> -
> - ret = devm_add_action_or_reset(st->dev, ltc2947_clk_disable,
> - extclk);
> - if (ret)
> - return ret;
> /* as in table 1 of the datasheet */
> if (rate_hz >= LTC2947_CLK_MIN && rate_hz <= 1000000)
> pre = 0;
> diff --git a/drivers/hwmon/mr75203.c b/drivers/hwmon/mr75203.c
> index 1ba1e3145969..0c691f291a64 100644
> --- a/drivers/hwmon/mr75203.c
> +++ b/drivers/hwmon/mr75203.c
> @@ -461,24 +461,6 @@ static int pvt_get_regmap(struct platform_device *pdev, char *reg_name,
> return 0;
> }
>
> -static void pvt_clk_disable(void *data)
> -{
> - struct pvt_device *pvt = data;
> -
> - clk_disable_unprepare(pvt->clk);
> -}
> -
> -static int pvt_clk_enable(struct device *dev, struct pvt_device *pvt)
> -{
> - int ret;
> -
> - ret = clk_prepare_enable(pvt->clk);
> - if (ret)
> - return ret;
> -
> - return devm_add_action_or_reset(dev, pvt_clk_disable, pvt);
> -}
> -
> static void pvt_reset_control_assert(void *data)
> {
> struct pvt_device *pvt = data;
> @@ -515,16 +497,10 @@ static int mr75203_probe(struct platform_device *pdev)
> if (ret)
> return ret;
>
> - pvt->clk = devm_clk_get(dev, NULL);
> + pvt->clk = devm_clk_get_enabled(dev, NULL);
> if (IS_ERR(pvt->clk))
> return dev_err_probe(dev, PTR_ERR(pvt->clk), "failed to get clock\n");
>
> - ret = pvt_clk_enable(dev, pvt);
> - if (ret) {
> - dev_err(dev, "failed to enable clock\n");
> - return ret;
> - }
> -
> pvt->rst = devm_reset_control_get_exclusive(dev, NULL);
> if (IS_ERR(pvt->rst))
> return dev_err_probe(dev, PTR_ERR(pvt->rst),
> diff --git a/drivers/hwmon/sparx5-temp.c b/drivers/hwmon/sparx5-temp.c
> index 98be48e3a22a..04fd8505e5d6 100644
> --- a/drivers/hwmon/sparx5-temp.c
> +++ b/drivers/hwmon/sparx5-temp.c
> @@ -26,13 +26,6 @@ struct s5_hwmon {
> struct clk *clk;
> };
>
> -static void s5_temp_clk_disable(void *data)
> -{
> - struct clk *clk = data;
> -
> - clk_disable_unprepare(clk);
> -}
> -
> static void s5_temp_enable(struct s5_hwmon *hwmon)
> {
> u32 val = readl(hwmon->base + TEMP_CFG);
> @@ -113,7 +106,6 @@ static int s5_temp_probe(struct platform_device *pdev)
> {
> struct device *hwmon_dev;
> struct s5_hwmon *hwmon;
> - int ret;
>
> hwmon = devm_kzalloc(&pdev->dev, sizeof(*hwmon), GFP_KERNEL);
> if (!hwmon)
> @@ -123,19 +115,10 @@ static int s5_temp_probe(struct platform_device *pdev)
> if (IS_ERR(hwmon->base))
> return PTR_ERR(hwmon->base);
>
> - hwmon->clk = devm_clk_get(&pdev->dev, NULL);
> + hwmon->clk = devm_clk_get_enabled(&pdev->dev, NULL);
> if (IS_ERR(hwmon->clk))
> return PTR_ERR(hwmon->clk);
>
> - ret = clk_prepare_enable(hwmon->clk);
> - if (ret)
> - return ret;
> -
> - ret = devm_add_action_or_reset(&pdev->dev, s5_temp_clk_disable,
> - hwmon->clk);
> - if (ret)
> - return ret;
> -
> s5_temp_enable(hwmon);
>
> hwmon_dev = devm_hwmon_device_register_with_info(&pdev->dev,