hc
2024-05-13 9d77db3c730780c8ef5ccd4b66403ff5675cfe4e
kernel/drivers/watchdog/at91sam9_wdt.c
....@@ -206,10 +206,9 @@
206206 "min heartbeat and max heartbeat might be too close for the system to handle it correctly\n");
207207
208208 if ((tmp & AT91_WDT_WDFIEN) && wdt->irq) {
209
- err = request_irq(wdt->irq, wdt_interrupt,
210
- IRQF_SHARED | IRQF_IRQPOLL |
211
- IRQF_NO_SUSPEND,
212
- pdev->name, wdt);
209
+ err = devm_request_irq(dev, wdt->irq, wdt_interrupt,
210
+ IRQF_SHARED | IRQF_IRQPOLL | IRQF_NO_SUSPEND,
211
+ pdev->name, wdt);
213212 if (err)
214213 return err;
215214 }
....@@ -327,7 +326,6 @@
327326
328327 static int __init at91wdt_probe(struct platform_device *pdev)
329328 {
330
- struct resource *r;
331329 int err;
332330 struct at91wdt *wdt;
333331
....@@ -346,8 +344,7 @@
346344 wdt->wdd.min_timeout = 1;
347345 wdt->wdd.max_timeout = 0xFFFF;
348346
349
- r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
350
- wdt->base = devm_ioremap_resource(&pdev->dev, r);
347
+ wdt->base = devm_platform_ioremap_resource(pdev, 0);
351348 if (IS_ERR(wdt->base))
352349 return PTR_ERR(wdt->base);
353350