.. | .. |
---|
206 | 206 | "min heartbeat and max heartbeat might be too close for the system to handle it correctly\n"); |
---|
207 | 207 | |
---|
208 | 208 | 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); |
---|
213 | 212 | if (err) |
---|
214 | 213 | return err; |
---|
215 | 214 | } |
---|
.. | .. |
---|
327 | 326 | |
---|
328 | 327 | static int __init at91wdt_probe(struct platform_device *pdev) |
---|
329 | 328 | { |
---|
330 | | - struct resource *r; |
---|
331 | 329 | int err; |
---|
332 | 330 | struct at91wdt *wdt; |
---|
333 | 331 | |
---|
.. | .. |
---|
346 | 344 | wdt->wdd.min_timeout = 1; |
---|
347 | 345 | wdt->wdd.max_timeout = 0xFFFF; |
---|
348 | 346 | |
---|
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); |
---|
351 | 348 | if (IS_ERR(wdt->base)) |
---|
352 | 349 | return PTR_ERR(wdt->base); |
---|
353 | 350 | |
---|