update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/char/hw_random/nomadik-rng.c
..
..
@@ -13,8 +13,6 @@
13
13
 #include <linux/clk.h>
14
14
 #include <linux/err.h>
15
15
 
16
-static struct clk *rng_clk;
17
-
18
16
 static int nmk_rng_read(struct hwrng *rng, void *data, size_t max, bool wait)
19
17
 {
20
18
 	void __iomem *base = (void __iomem *)rng->priv;
..
..
@@ -36,21 +34,20 @@
36
34
 
37
35
 static int nmk_rng_probe(struct amba_device *dev, const struct amba_id *id)
38
36
 {
37
+	struct clk *rng_clk;
39
38
 	void __iomem *base;
40
39
 	int ret;
41
40
 
42
-	rng_clk = devm_clk_get(&dev->dev, NULL);
41
+	rng_clk = devm_clk_get_enabled(&dev->dev, NULL);
43
42
 	if (IS_ERR(rng_clk)) {
44
43
 		dev_err(&dev->dev, "could not get rng clock\n");
45
44
 		ret = PTR_ERR(rng_clk);
46
45
 		return ret;
47
46
 	}
48
47
 
49
-	clk_prepare_enable(rng_clk);
50
-
51
48
 	ret = amba_request_regions(dev, dev->dev.init_name);
52
49
 	if (ret)
53
-		goto out_clk;
50
+		return ret;
54
51
 	ret = -ENOMEM;
55
52
 	base = devm_ioremap(&dev->dev, dev->res.start,
56
53
 			    resource_size(&dev->res));
..
..
@@ -64,15 +61,12 @@
64
61
 
65
62
 out_release:
66
63
 	amba_release_regions(dev);
67
-out_clk:
68
-	clk_disable_unprepare(rng_clk);
69
64
 	return ret;
70
65
 }
71
66
 
72
67
 static void nmk_rng_remove(struct amba_device *dev)
73
68
 {
74
69
 	amba_release_regions(dev);
75
-	clk_disable_unprepare(rng_clk);
76
70
 }
77
71
 
78
72
 static const struct amba_id nmk_rng_ids[] = {