iio: ad4310: Replace devm_clk_register() with devm_clk_hw_register()
authorLars-Peter Clausen <lars@metafoo.de>
Sun, 10 Sep 2023 14:09:03 +0000 (07:09 -0700)
committerJonathan Cameron <Jonathan.Cameron@huawei.com>
Wed, 13 Sep 2023 19:13:54 +0000 (20:13 +0100)
The devm_clk_register() is deprecated and devm_clk_hw_register() should be
used as a replacement.

Switching to the clk_hw interface also allows to use the built-in device
managed version of registering the clock provider. The non-clk_hw interface
does not have a device managed version.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Reviewed-by: Nuno Sa <nuno.sa@analog.com>
Link: https://lore.kernel.org/r/20230910140903.551081-1-lars@metafoo.de
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
drivers/iio/adc/ad4130.c

index 5a5dd5e87ffc4481c9776d509d32c319ba83135a..feb86fe6c422df4ad3085b1c4ffea1651ad4cfd1 100644 (file)
@@ -1817,18 +1817,12 @@ static const struct clk_ops ad4130_int_clk_ops = {
        .unprepare = ad4130_int_clk_unprepare,
 };
 
-static void ad4130_clk_del_provider(void *of_node)
-{
-       of_clk_del_provider(of_node);
-}
-
 static int ad4130_setup_int_clk(struct ad4130_state *st)
 {
        struct device *dev = &st->spi->dev;
        struct device_node *of_node = dev_of_node(dev);
        struct clk_init_data init;
        const char *clk_name;
-       struct clk *clk;
        int ret;
 
        if (st->int_pin_sel == AD4130_INT_PIN_CLK ||
@@ -1845,15 +1839,12 @@ static int ad4130_setup_int_clk(struct ad4130_state *st)
        init.ops = &ad4130_int_clk_ops;
 
        st->int_clk_hw.init = &init;
-       clk = devm_clk_register(dev, &st->int_clk_hw);
-       if (IS_ERR(clk))
-               return PTR_ERR(clk);
-
-       ret = of_clk_add_provider(of_node, of_clk_src_simple_get, clk);
+       ret = devm_clk_hw_register(dev, &st->int_clk_hw);
        if (ret)
                return ret;
 
-       return devm_add_action_or_reset(dev, ad4130_clk_del_provider, of_node);
+       return devm_of_clk_add_hw_provider(dev, of_clk_hw_simple_get,
+                                          &st->int_clk_hw);
 }
 
 static int ad4130_setup(struct iio_dev *indio_dev)