change system file

hc

2024-10-09 244b2c5ca8b14627e4a17755e5922221e121c771

 kernel/drivers/clk/ti/apll.c
..
..
@@ -140,11 +140,12 @@
140
140
 	struct clk_hw_omap *clk_hw = to_clk_hw_omap(hw);
141
141
 	struct dpll_data *ad = clk_hw->dpll_data;
142
142
 	struct clk *clk;
143
+	const struct clk_init_data *init = clk_hw->hw.init;
143
144
 
144
145
 	clk = of_clk_get(node, 0);
145
146
 	if (IS_ERR(clk)) {
146
-		pr_debug("clk-ref for %s not ready, retry\n",
147
-			 node->name);
147
+		pr_debug("clk-ref for %pOFn not ready, retry\n",
148
+			 node);
148
149
 		if (!ti_clk_retry_init(node, hw, omap_clk_register_apll))
149
150
 			return;
150
151
 
..
..
@@ -155,8 +156,8 @@
155
156
 
156
157
 	clk = of_clk_get(node, 1);
157
158
 	if (IS_ERR(clk)) {
158
-		pr_debug("clk-bypass for %s not ready, retry\n",
159
-			 node->name);
159
+		pr_debug("clk-bypass for %pOFn not ready, retry\n",
160
+			 node);
160
161
 		if (!ti_clk_retry_init(node, hw, omap_clk_register_apll))
161
162
 			return;
162
163
 
..
..
@@ -165,18 +166,18 @@
165
166
 
166
167
 	ad->clk_bypass = __clk_get_hw(clk);
167
168
 
168
-	clk = ti_clk_register(NULL, &clk_hw->hw, node->name);
169
+	clk = ti_clk_register_omap_hw(NULL, &clk_hw->hw, node->name);
169
170
 	if (!IS_ERR(clk)) {
170
171
 		of_clk_add_provider(node, of_clk_src_simple_get, clk);
171
-		kfree(clk_hw->hw.init->parent_names);
172
-		kfree(clk_hw->hw.init);
172
+		kfree(init->parent_names);
173
+		kfree(init);
173
174
 		return;
174
175
 	}
175
176
 
176
177
 cleanup:
177
178
 	kfree(clk_hw->dpll_data);
178
-	kfree(clk_hw->hw.init->parent_names);
179
-	kfree(clk_hw->hw.init);
179
+	kfree(init->parent_names);
180
+	kfree(init);
180
181
 	kfree(clk_hw);
181
182
 }
182
183
 
..
..
@@ -202,7 +203,7 @@
202
203
 
203
204
 	init->num_parents = of_clk_get_parent_count(node);
204
205
 	if (init->num_parents < 1) {
205
-		pr_err("dra7 apll %s must have parent(s)\n", node->name);
206
+		pr_err("dra7 apll %pOFn must have parent(s)\n", node);
206
207
 		goto cleanup;
207
208
 	}
208
209
 
..
..
@@ -366,7 +367,7 @@
366
367
 
367
368
 	init->num_parents = of_clk_get_parent_count(node);
368
369
 	if (init->num_parents != 1) {
369
-		pr_err("%s must have one parent\n", node->name);
370
+		pr_err("%pOFn must have one parent\n", node);
370
371
 		goto cleanup;
371
372
 	}
372
373
 
..
..
@@ -374,13 +375,13 @@
374
375
 	init->parent_names = &parent_name;
375
376
 
376
377
 	if (of_property_read_u32(node, "ti,clock-frequency", &val)) {
377
-		pr_err("%s missing clock-frequency\n", node->name);
378
+		pr_err("%pOFn missing clock-frequency\n", node);
378
379
 		goto cleanup;
379
380
 	}
380
381
 	clk_hw->fixed_rate = val;
381
382
 
382
383
 	if (of_property_read_u32(node, "ti,bit-shift", &val)) {
383
-		pr_err("%s missing bit-shift\n", node->name);
384
+		pr_err("%pOFn missing bit-shift\n", node);
384
385
 		goto cleanup;
385
386
 	}
386
387
 
..
..
@@ -389,7 +390,7 @@
389
390
 	ad->autoidle_mask = 0x3 << val;
390
391
 
391
392
 	if (of_property_read_u32(node, "ti,idlest-shift", &val)) {
392
-		pr_err("%s missing idlest-shift\n", node->name);
393
+		pr_err("%pOFn missing idlest-shift\n", node);
393
394
 		goto cleanup;
394
395
 	}
395
396
 
..
..
@@ -402,7 +403,7 @@
402
403
 	if (ret)
403
404
 		goto cleanup;
404
405
 
405
-	clk = clk_register(NULL, &clk_hw->hw);
406
+	clk = ti_clk_register_omap_hw(NULL, &clk_hw->hw, node->name);
406
407
 	if (!IS_ERR(clk)) {
407
408
 		of_clk_add_provider(node, of_clk_src_simple_get, clk);
408
409
 		kfree(init);