修改内核路径

hc

2024-05-14 bedbef8ad3e75a304af6361af235302bcc61d06b

 kernel/drivers/watchdog/max63xx_wdt.c
..
..
@@ -187,9 +187,7 @@
187
187
 
188
188
 static int max63xx_mmap_init(struct platform_device *p, struct max63xx_wdt *wdt)
189
189
 {
190
-	struct resource *mem = platform_get_resource(p, IORESOURCE_MEM, 0);
191
-
192
-	wdt->base = devm_ioremap_resource(&p->dev, mem);
190
+	wdt->base = devm_platform_ioremap_resource(p, 0);
193
191
 	if (IS_ERR(wdt->base))
194
192
 		return PTR_ERR(wdt->base);
195
193
 
..
..
@@ -202,11 +200,12 @@
202
200
 
203
201
 static int max63xx_wdt_probe(struct platform_device *pdev)
204
202
 {
203
+	struct device *dev = &pdev->dev;
205
204
 	struct max63xx_wdt *wdt;
206
205
 	struct max63xx_timeout *table;
207
206
 	int err;
208
207
 
209
-	wdt = devm_kzalloc(&pdev->dev, sizeof(*wdt), GFP_KERNEL);
208
+	wdt = devm_kzalloc(dev, sizeof(*wdt), GFP_KERNEL);
210
209
 	if (!wdt)
211
210
 		return -ENOMEM;
212
211
 
..
..
@@ -217,7 +216,7 @@
217
216
 
218
217
 	wdt->timeout = max63xx_select_timeout(table, heartbeat);
219
218
 	if (!wdt->timeout) {
220
-		dev_err(&pdev->dev, "unable to satisfy %ds heartbeat request\n",
219
+		dev_err(dev, "unable to satisfy %ds heartbeat request\n",
221
220
 			heartbeat);
222
221
 		return -EINVAL;
223
222
 	}
..
..
@@ -229,27 +228,19 @@
229
228
 	platform_set_drvdata(pdev, &wdt->wdd);
230
229
 	watchdog_set_drvdata(&wdt->wdd, wdt);
231
230
 
232
-	wdt->wdd.parent = &pdev->dev;
231
+	wdt->wdd.parent = dev;
233
232
 	wdt->wdd.timeout = wdt->timeout->twd;
234
233
 	wdt->wdd.info = &max63xx_wdt_info;
235
234
 	wdt->wdd.ops = &max63xx_wdt_ops;
236
235
 
237
236
 	watchdog_set_nowayout(&wdt->wdd, nowayout);
238
237
 
239
-	err = watchdog_register_device(&wdt->wdd);
238
+	err = devm_watchdog_register_device(dev, &wdt->wdd);
240
239
 	if (err)
241
240
 		return err;
242
241
 
243
-	dev_info(&pdev->dev, "using %ds heartbeat with %ds initial delay\n",
242
+	dev_info(dev, "using %ds heartbeat with %ds initial delay\n",
244
243
 		 wdt->timeout->twd, wdt->timeout->tdelay);
245
-	return 0;
246
-}
247
-
248
-static int max63xx_wdt_remove(struct platform_device *pdev)
249
-{
250
-	struct watchdog_device *wdd = platform_get_drvdata(pdev);
251
-
252
-	watchdog_unregister_device(wdd);
253
244
 	return 0;
254
245
 }
255
246
 
..
..
@@ -266,7 +257,6 @@
266
257
 
267
258
 static struct platform_driver max63xx_wdt_driver = {
268
259
 	.probe		= max63xx_wdt_probe,
269
-	.remove		= max63xx_wdt_remove,
270
260
 	.id_table	= max63xx_id_table,
271
261
 	.driver		= {
272
262
 		.name	= "max63xx_wdt",