update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/clk/axs10x/pll_clock.c
..
..
@@ -14,6 +14,7 @@
14
14
 #include <linux/delay.h>
15
15
 #include <linux/err.h>
16
16
 #include <linux/device.h>
17
+#include <linux/io.h>
17
18
 #include <linux/of_address.h>
18
19
 #include <linux/of_device.h>
19
20
 #include <linux/slab.h>
..
..
@@ -220,7 +221,6 @@
220
221
 	struct device *dev = &pdev->dev;
221
222
 	const char *parent_name;
222
223
 	struct axs10x_pll_clk *pll_clk;
223
-	struct resource *mem;
224
224
 	struct clk_init_data init = { };
225
225
 	int ret;
226
226
 
..
..
@@ -228,13 +228,11 @@
228
228
 	if (!pll_clk)
229
229
 		return -ENOMEM;
230
230
 
231
-	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
232
-	pll_clk->base = devm_ioremap_resource(dev, mem);
231
+	pll_clk->base = devm_platform_ioremap_resource(pdev, 0);
233
232
 	if (IS_ERR(pll_clk->base))
234
233
 		return PTR_ERR(pll_clk->base);
235
234
 
236
-	mem = platform_get_resource(pdev, IORESOURCE_MEM, 1);
237
-	pll_clk->lock = devm_ioremap_resource(dev, mem);
235
+	pll_clk->lock = devm_platform_ioremap_resource(pdev, 1);
238
236
 	if (IS_ERR(pll_clk->lock))
239
237
 		return PTR_ERR(pll_clk->lock);
240
238
 
..
..
@@ -301,13 +299,13 @@
301
299
 
302
300
 	ret = clk_hw_register(NULL, &pll_clk->hw);
303
301
 	if (ret) {
304
-		pr_err("failed to register %s clock\n", node->name);
302
+		pr_err("failed to register %pOFn clock\n", node);
305
303
 		goto err_unmap_lock;
306
304
 	}
307
305
 
308
306
 	ret = of_clk_add_hw_provider(node, of_clk_hw_simple_get, &pll_clk->hw);
309
307
 	if (ret) {
310
-		pr_err("failed to add hw provider for %s clock\n", node->name);
308
+		pr_err("failed to add hw provider for %pOFn clock\n", node);
311
309
 		goto err_unregister_clk;
312
310
 	}
313
311