diff options
| author | Stephen Boyd <stephen.boyd@linaro.org> | 2016-06-01 19:15:26 -0400 |
|---|---|---|
| committer | Stephen Boyd <sboyd@codeaurora.org> | 2016-08-24 20:29:59 -0400 |
| commit | d06e46c25a8945fe3e6f5385221a3551f0866f79 (patch) | |
| tree | 92147ab32c12a2ee9cf800a6e444e2735a6defd1 /drivers/clk | |
| parent | 93ae00be20d872bfa3099e6376442362aaa8d567 (diff) | |
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: Stephen Boyd <stephen.boyd@linaro.org>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Diffstat (limited to 'drivers/clk')
| -rw-r--r-- | drivers/clk/clk-si514.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/clk/clk-si514.c b/drivers/clk/clk-si514.c index ceef25b0990b..09b6718956bd 100644 --- a/drivers/clk/clk-si514.c +++ b/drivers/clk/clk-si514.c | |||
| @@ -305,7 +305,6 @@ static int si514_probe(struct i2c_client *client, | |||
| 305 | { | 305 | { |
| 306 | struct clk_si514 *data; | 306 | struct clk_si514 *data; |
| 307 | struct clk_init_data init; | 307 | struct clk_init_data init; |
| 308 | struct clk *clk; | ||
| 309 | int err; | 308 | int err; |
| 310 | 309 | ||
| 311 | data = devm_kzalloc(&client->dev, sizeof(*data), GFP_KERNEL); | 310 | data = devm_kzalloc(&client->dev, sizeof(*data), GFP_KERNEL); |
| @@ -330,13 +329,13 @@ static int si514_probe(struct i2c_client *client, | |||
| 330 | 329 | ||
| 331 | i2c_set_clientdata(client, data); | 330 | i2c_set_clientdata(client, data); |
| 332 | 331 | ||
| 333 | clk = devm_clk_register(&client->dev, &data->hw); | 332 | err = devm_clk_hw_register(&client->dev, &data->hw); |
| 334 | if (IS_ERR(clk)) { | 333 | if (err) { |
| 335 | dev_err(&client->dev, "clock registration failed\n"); | 334 | dev_err(&client->dev, "clock registration failed\n"); |
| 336 | return PTR_ERR(clk); | 335 | return err; |
| 337 | } | 336 | } |
| 338 | err = of_clk_add_provider(client->dev.of_node, of_clk_src_simple_get, | 337 | err = of_clk_add_hw_provider(client->dev.of_node, of_clk_hw_simple_get, |
| 339 | clk); | 338 | &data->hw); |
| 340 | if (err) { | 339 | if (err) { |
| 341 | dev_err(&client->dev, "unable to add clk provider\n"); | 340 | dev_err(&client->dev, "unable to add clk provider\n"); |
| 342 | return err; | 341 | return err; |