Skip to content

Commit

Permalink
clk: si570: Use managed of_clk_add_hw_provider()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Lars-Peter Clausen authored and Stephen Boyd committed Apr 10, 2023
1 parent a7f3b67 commit bda7339
Showing 1 changed file with 3 additions and 11 deletions.
14 changes: 3 additions & 11 deletions drivers/clk/clk-si570.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 */
Expand All @@ -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" },
Expand All @@ -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);
Expand Down

0 comments on commit bda7339

Please sign in to comment.