.. | .. |
---|
292 | 292 | } |
---|
293 | 293 | |
---|
294 | 294 | ret = watchdog_register_device(&wdt->wdd); |
---|
295 | | - if (ret) { |
---|
296 | | - dev_err(&adev->dev, "watchdog_register_device() failed: %d\n", |
---|
297 | | - ret); |
---|
| 295 | + if (ret) |
---|
298 | 296 | goto err; |
---|
299 | | - } |
---|
300 | 297 | amba_set_drvdata(adev, wdt); |
---|
301 | 298 | |
---|
302 | 299 | dev_info(&adev->dev, "registration successful\n"); |
---|
.. | .. |
---|
307 | 304 | return ret; |
---|
308 | 305 | } |
---|
309 | 306 | |
---|
310 | | -static int sp805_wdt_remove(struct amba_device *adev) |
---|
| 307 | +static void sp805_wdt_remove(struct amba_device *adev) |
---|
311 | 308 | { |
---|
312 | 309 | struct sp805_wdt *wdt = amba_get_drvdata(adev); |
---|
313 | 310 | |
---|
314 | 311 | watchdog_unregister_device(&wdt->wdd); |
---|
315 | 312 | watchdog_set_drvdata(&wdt->wdd, NULL); |
---|
316 | | - |
---|
317 | | - return 0; |
---|
318 | 313 | } |
---|
319 | 314 | |
---|
320 | 315 | static int __maybe_unused sp805_wdt_suspend(struct device *dev) |
---|