[PATCH 7/8] drivers: watchdog: Fixed missing blank line warning

Athira Lekshmi
2014-12-16T16:26:13Z

drivers/watchdog/at91sam9_wdt.c | 3 +++
1 file changed, 3 insertions(+)

diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c
index 489729b..794a34a 100644
--- a/drivers/watchdog/at91sam9_wdt.c
+++ b/drivers/watchdog/at91sam9_wdt.c
@@ -82,6 +82,7 @@ MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started "
#define to_wdt(wdd) container_of(wdd, struct at91wdt, wdd)
struct at91wdt {
struct watchdog_device wdd;
+
void __iomem *base;
unsigned long next_heartbeat; /* the next_heartbeat for the timer */
struct timer_list timer; /* The timer that pings the watchdog */
@@ -121,6 +122,7 @@ static inline void at91_wdt_reset(struct at91wdt *wdt)
static void at91_ping(unsigned long data)
{
struct at91wdt *wdt = (struct at91wdt *)data;
+
if (time_before(jiffies, wdt->next_heartbeat) ||
!watchdog_active(&wdt->wdd)) {
at91_wdt_reset(wdt);
@@ -372,6 +374,7 @@ static int __init at91wdt_probe(struct platform_device *pdev)
static int __exit at91wdt_remove(struct platform_device *pdev)
{
struct at91wdt *wdt = platform_get_drvdata(pdev);
+
watchdog_unregister_device(&wdt->wdd);

pr_warn("I quit now, hardware will probably reboot!\n");
--
1.7.9.5