forked from ~ljy/RK356X_SDK_RELEASE

blame | history | patch | commit | commitdiff
hc
2024-09-20 a36159eec6ca17402b0e146b86efaf76568dc353 
 kernel/drivers/clk/clk-scpi.c
....@@ -1,19 +1,8 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
12 /*
23  * System Control and Power Interface (SCPI) Protocol based clock driver
34  *
45  * Copyright (C) 2015 ARM Ltd.
5
- *
6
- * This program is free software; you can redistribute it and/or modify it
7
- * under the terms and conditions of the GNU General Public License,
8
- * version 2, as published by the Free Software Foundation.
9
- *
10
- * This program is distributed in the hope it will be useful, but WITHOUT
11
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
12
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
13
- * more details.
14
- *
15
- * You should have received a copy of the GNU General Public License along with
16
- * this program. If not, see <http://www.gnu.org/licenses/>.
176  */
187 
198 #include <linux/clk-provider.h>
....@@ -150,7 +139,7 @@
150139 scpi_clk_ops_init(struct device *dev, const struct of_device_id *match,
151140 		  struct scpi_clk *sclk, const char *name)
152141 {
153
-	struct clk_init_data init = {};
142
+	struct clk_init_data init;
154143 	unsigned long min = 0, max = 0;
155144 	int ret;
156145 
....@@ -207,7 +196,7 @@
207196 
208197 	count = of_property_count_strings(np, "clock-output-names");
209198 	if (count < 0) {
210
-		dev_err(dev, "%s: invalid clock output count\n", np->name);
199
+		dev_err(dev, "%pOFn: invalid clock output count\n", np);
211200 		return -EINVAL;
212201 	}
213202 
....@@ -232,13 +221,13 @@
232221 
233222 		if (of_property_read_string_index(np, "clock-output-names",
234223 						  idx, &name)) {
235
-			dev_err(dev, "invalid clock name @ %s\n", np->name);
224
+			dev_err(dev, "invalid clock name @ %pOFn\n", np);
236225 			return -EINVAL;
237226 		}
238227 
239228 		if (of_property_read_u32_index(np, "clock-indices",
240229 					       idx, &val)) {
241
-			dev_err(dev, "invalid clock index @ %s\n", np->name);
230
+			dev_err(dev, "invalid clock index @ %pOFn\n", np);
242231 			return -EINVAL;
243232 		}
244233