hc
2024-05-13 9d77db3c730780c8ef5ccd4b66403ff5675cfe4e
kernel/drivers/clk/imx/clk-pllv2.c
....@@ -239,12 +239,13 @@
239239 .set_rate = clk_pllv2_set_rate,
240240 };
241241
242
-struct clk *imx_clk_pllv2(const char *name, const char *parent,
242
+struct clk_hw *imx_clk_hw_pllv2(const char *name, const char *parent,
243243 void __iomem *base)
244244 {
245245 struct clk_pllv2 *pll;
246
- struct clk *clk;
247
- struct clk_init_data init = {};
246
+ struct clk_hw *hw;
247
+ struct clk_init_data init;
248
+ int ret;
248249
249250 pll = kzalloc(sizeof(*pll), GFP_KERNEL);
250251 if (!pll)
....@@ -259,10 +260,13 @@
259260 init.num_parents = 1;
260261
261262 pll->hw.init = &init;
263
+ hw = &pll->hw;
262264
263
- clk = clk_register(NULL, &pll->hw);
264
- if (IS_ERR(clk))
265
+ ret = clk_hw_register(NULL, hw);
266
+ if (ret) {
265267 kfree(pll);
268
+ return ERR_PTR(ret);
269
+ }
266270
267
- return clk;
271
+ return hw;
268272 }