Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d06e46c2 authored by Stephen Boyd's avatar Stephen Boyd Committed by Stephen Boyd
Browse files

clk: si514: Migrate to clk_hw based OF and registration APIs 



Now that we have clk_hw based provider APIs to register clks, we
can get rid of struct clk pointers while registering clks in
these drivers, allowing us to move closer to a clear split of
consumer and provider clk APIs.

Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: Sören Brinkmann <soren.brinkmann@xilinx.com>
Cc: Mike Looijmans <mike.looijmans@topic.nl>
Signed-off-by: default avatarStephen Boyd <stephen.boyd@linaro.org>
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
parent 93ae00be

drivers/clk/clk-si514.c

+5 −6
Original line number Diff line number Diff line
@@ -305,7 +305,6 @@ static int si514_probe(struct i2c_client *client, 
{

	struct clk_si514 *data;

	struct clk_init_data init;

	struct clk *clk;

	int err;



	data = devm_kzalloc(&client->dev, sizeof(*data), GFP_KERNEL);
@@ -330,13 +329,13 @@ static int si514_probe(struct i2c_client *client, 


	i2c_set_clientdata(client, data);



	clk = devm_clk_register(&client->dev, &data->hw);

	if (IS_ERR(clk)) {

	err = devm_clk_hw_register(&client->dev, &data->hw);

	if (err) {

		dev_err(&client->dev, "clock registration failed\n");

		return PTR_ERR(clk);

		return err;

	}

	err = of_clk_add_provider(client->dev.of_node, of_clk_src_simple_get,

			clk);

	err = of_clk_add_hw_provider(client->dev.of_node, of_clk_hw_simple_get,

				     &data->hw);

	if (err) {

		dev_err(&client->dev, "unable to add clk provider\n");

		return err;