clk: si570: Use managed `of_clk_add_hw_provider()`
authorLars-Peter Clausen <lars@metafoo.de>
Mon, 10 Apr 2023 01:45:00 +0000 (18:45 -0700)
committerStephen Boyd <sboyd@kernel.org>
Mon, 10 Apr 2023 19:56:24 +0000 (12:56 -0700)
Use the managed `devm_of_clk_add_hw_provider()` instead of
`of_clk_add_hw_provider()`.

This makes sure the provider gets automatically removed on unbind and
allows to completely eliminate the drivers `remove()` callback.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Link: https://lore.kernel.org/r/20230410014502.27929-9-lars@metafoo.de
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
drivers/clk/clk-si570.c

index 0a6d70c497267872ee843d7bc3e399d5491acb86..0b834e9efb4bc2d1473451655c27870ddb782e61 100644 (file)
@@ -474,8 +474,8 @@ static int si570_probe(struct i2c_client *client)
                dev_err(&client->dev, "clock registration failed\n");
                return err;
        }
-       err = of_clk_add_hw_provider(client->dev.of_node, of_clk_hw_simple_get,
-                                    &data->hw);
+       err = devm_of_clk_add_hw_provider(&client->dev, of_clk_hw_simple_get,
+                                         &data->hw);
        if (err) {
                dev_err(&client->dev, "unable to add clk provider\n");
                return err;
@@ -485,10 +485,8 @@ static int si570_probe(struct i2c_client *client)
        if (!of_property_read_u32(client->dev.of_node, "clock-frequency",
                                &initial_fout)) {
                err = clk_set_rate(data->hw.clk, initial_fout);
-               if (err) {
-                       of_clk_del_provider(client->dev.of_node);
+               if (err)
                        return err;
-               }
        }
 
        /* Display a message indicating that we've successfully registered */
@@ -498,11 +496,6 @@ static int si570_probe(struct i2c_client *client)
        return 0;
 }
 
-static void si570_remove(struct i2c_client *client)
-{
-       of_clk_del_provider(client->dev.of_node);
-}
-
 static const struct of_device_id clk_si570_of_match[] = {
        { .compatible = "silabs,si570" },
        { .compatible = "silabs,si571" },
@@ -518,7 +511,6 @@ static struct i2c_driver si570_driver = {
                .of_match_table = clk_si570_of_match,
        },
        .probe_new      = si570_probe,
-       .remove         = si570_remove,
        .id_table       = si570_id,
 };
 module_i2c_driver(si570_driver);