mk-rootfs.sh

hc

2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376

 kernel/drivers/watchdog/of_xilinx_wdt.c
..
..
@@ -151,43 +151,46 @@
151
151
 		return XWT_TIMER_FAILED;
152
152
 }
153
153
 
154
+static void xwdt_clk_disable_unprepare(void *data)
155
+{
156
+	clk_disable_unprepare(data);
157
+}
158
+
154
159
 static int xwdt_probe(struct platform_device *pdev)
155
160
 {
161
+	struct device *dev = &pdev->dev;
156
162
 	int rc;
157
163
 	u32 pfreq = 0, enable_once = 0;
158
-	struct resource *res;
159
164
 	struct xwdt_device *xdev;
160
165
 	struct watchdog_device *xilinx_wdt_wdd;
161
166
 
162
-	xdev = devm_kzalloc(&pdev->dev, sizeof(*xdev), GFP_KERNEL);
167
+	xdev = devm_kzalloc(dev, sizeof(*xdev), GFP_KERNEL);
163
168
 	if (!xdev)
164
169
 		return -ENOMEM;
165
170
 
166
171
 	xilinx_wdt_wdd = &xdev->xilinx_wdt_wdd;
167
172
 	xilinx_wdt_wdd->info = &xilinx_wdt_ident;
168
173
 	xilinx_wdt_wdd->ops = &xilinx_wdt_ops;
169
-	xilinx_wdt_wdd->parent = &pdev->dev;
174
+	xilinx_wdt_wdd->parent = dev;
170
175
 
171
-	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
172
-	xdev->base = devm_ioremap_resource(&pdev->dev, res);
176
+	xdev->base = devm_platform_ioremap_resource(pdev, 0);
173
177
 	if (IS_ERR(xdev->base))
174
178
 		return PTR_ERR(xdev->base);
175
179
 
176
-	rc = of_property_read_u32(pdev->dev.of_node, "xlnx,wdt-interval",
180
+	rc = of_property_read_u32(dev->of_node, "xlnx,wdt-interval",
177
181
 				  &xdev->wdt_interval);
178
182
 	if (rc)
179
-		dev_warn(&pdev->dev,
180
-			 "Parameter \"xlnx,wdt-interval\" not found\n");
183
+		dev_warn(dev, "Parameter \"xlnx,wdt-interval\" not found\n");
181
184
 
182
-	rc = of_property_read_u32(pdev->dev.of_node, "xlnx,wdt-enable-once",
185
+	rc = of_property_read_u32(dev->of_node, "xlnx,wdt-enable-once",
183
186
 				  &enable_once);
184
187
 	if (rc)
185
-		dev_warn(&pdev->dev,
188
+		dev_warn(dev,
186
189
 			 "Parameter \"xlnx,wdt-enable-once\" not found\n");
187
190
 
188
191
 	watchdog_set_nowayout(xilinx_wdt_wdd, enable_once);
189
192
 
190
-	xdev->clk = devm_clk_get(&pdev->dev, NULL);
193
+	xdev->clk = devm_clk_get(dev, NULL);
191
194
 	if (IS_ERR(xdev->clk)) {
192
195
 		if (PTR_ERR(xdev->clk) != -ENOENT)
193
196
 			return PTR_ERR(xdev->clk);
..
..
@@ -198,10 +201,10 @@
198
201
 		 */
199
202
 		xdev->clk = NULL;
200
203
 
201
-		rc = of_property_read_u32(pdev->dev.of_node, "clock-frequency",
204
+		rc = of_property_read_u32(dev->of_node, "clock-frequency",
202
205
 					  &pfreq);
203
206
 		if (rc)
204
-			dev_warn(&pdev->dev,
207
+			dev_warn(dev,
205
208
 				 "The watchdog clock freq cannot be obtained\n");
206
209
 	} else {
207
210
 		pfreq = clk_get_rate(xdev->clk);
..
..
@@ -220,42 +223,30 @@
220
223
 
221
224
 	rc = clk_prepare_enable(xdev->clk);
222
225
 	if (rc) {
223
-		dev_err(&pdev->dev, "unable to enable clock\n");
226
+		dev_err(dev, "unable to enable clock\n");
224
227
 		return rc;
225
228
 	}
229
+	rc = devm_add_action_or_reset(dev, xwdt_clk_disable_unprepare,
230
+				      xdev->clk);
231
+	if (rc)
232
+		return rc;
226
233
 
227
234
 	rc = xwdt_selftest(xdev);
228
235
 	if (rc == XWT_TIMER_FAILED) {
229
-		dev_err(&pdev->dev, "SelfTest routine error\n");
230
-		goto err_clk_disable;
236
+		dev_err(dev, "SelfTest routine error\n");
237
+		return rc;
231
238
 	}
232
239
 
233
-	rc = watchdog_register_device(xilinx_wdt_wdd);
234
-	if (rc) {
235
-		dev_err(&pdev->dev, "Cannot register watchdog (err=%d)\n", rc);
236
-		goto err_clk_disable;
237
-	}
240
+	rc = devm_watchdog_register_device(dev, xilinx_wdt_wdd);
241
+	if (rc)
242
+		return rc;
238
243
 
239
244
 	clk_disable(xdev->clk);
240
245
 
241
-	dev_info(&pdev->dev, "Xilinx Watchdog Timer at %p with timeout %ds\n",
246
+	dev_info(dev, "Xilinx Watchdog Timer at %p with timeout %ds\n",
242
247
 		 xdev->base, xilinx_wdt_wdd->timeout);
243
248
 
244
249
 	platform_set_drvdata(pdev, xdev);
245
-
246
-	return 0;
247
-err_clk_disable:
248
-	clk_disable_unprepare(xdev->clk);
249
-
250
-	return rc;
251
-}
252
-
253
-static int xwdt_remove(struct platform_device *pdev)
254
-{
255
-	struct xwdt_device *xdev = platform_get_drvdata(pdev);
256
-
257
-	watchdog_unregister_device(&xdev->xilinx_wdt_wdd);
258
-	clk_disable_unprepare(xdev->clk);
259
250
 
260
251
 	return 0;
261
252
 }
..
..
@@ -305,7 +296,6 @@
305
296
 
306
297
 static struct platform_driver xwdt_driver = {
307
298
 	.probe       = xwdt_probe,
308
-	.remove      = xwdt_remove,
309
299
 	.driver = {
310
300
 		.name  = WATCHDOG_NAME,
311
301
 		.of_match_table = xwdt_of_match,