hc
2023-12-09 b22da3d8526a935aa31e086e63f60ff3246cb61c
kernel/drivers/char/hw_random/nomadik-rng.c
....@@ -1,11 +1,7 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
12 /*
23 * Nomadik RNG support
34 * Copyright 2009 Alessandro Rubini
4
- *
5
- * This program is free software; you can redistribute it and/or modify
6
- * it under the terms of the GNU General Public License as published by
7
- * the Free Software Foundation; either version 2 of the License, or
8
- * (at your option) any later version.
95 */
106
117 #include <linux/kernel.h>
....@@ -61,7 +57,7 @@
6157 if (!base)
6258 goto out_release;
6359 nmk_rng.priv = (unsigned long)base;
64
- ret = hwrng_register(&nmk_rng);
60
+ ret = devm_hwrng_register(&dev->dev, &nmk_rng);
6561 if (ret)
6662 goto out_release;
6763 return 0;
....@@ -69,19 +65,17 @@
6965 out_release:
7066 amba_release_regions(dev);
7167 out_clk:
72
- clk_disable(rng_clk);
68
+ clk_disable_unprepare(rng_clk);
7369 return ret;
7470 }
7571
76
-static int nmk_rng_remove(struct amba_device *dev)
72
+static void nmk_rng_remove(struct amba_device *dev)
7773 {
78
- hwrng_unregister(&nmk_rng);
7974 amba_release_regions(dev);
80
- clk_disable(rng_clk);
81
- return 0;
75
+ clk_disable_unprepare(rng_clk);
8276 }
8377
84
-static struct amba_id nmk_rng_ids[] = {
78
+static const struct amba_id nmk_rng_ids[] = {
8579 {
8680 .id = 0x000805e1,
8781 .mask = 0x000fffff, /* top bits are rev and cfg: accept all */