diff options
author | Muhammad Falak R Wani <falakreyaz@gmail.com> | 2016-05-06 08:59:40 -0400 |
---|---|---|
committer | Wim Van Sebroeck <wim@iguana.be> | 2016-05-14 12:25:49 -0400 |
commit | d904ac34bdbcf62a50c745cfe991681ae3948e4e (patch) | |
tree | f4353f84dcbf5e71dc5191ddc7ae936cb979751d /drivers/watchdog/cpwd.c | |
parent | fc4d2c7390dde766ec62f8f83be06e9227e9eb7a (diff) |
watchdog: cpwd: Use setup_timer()
The function setup_timer combines the initialization of a timer with
the initialization of the timer's function and data fields.
The multiline code for timer initialization is now replaced
with function setup_timer.
Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog/cpwd.c')
-rw-r--r-- | drivers/watchdog/cpwd.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/watchdog/cpwd.c b/drivers/watchdog/cpwd.c index 02007689e9ca..71ee07950e63 100644 --- a/drivers/watchdog/cpwd.c +++ b/drivers/watchdog/cpwd.c | |||
@@ -611,9 +611,7 @@ static int cpwd_probe(struct platform_device *op) | |||
611 | } | 611 | } |
612 | 612 | ||
613 | if (p->broken) { | 613 | if (p->broken) { |
614 | init_timer(&cpwd_timer); | 614 | setup_timer(&cpwd_timer, cpwd_brokentimer, (unsigned long)p); |
615 | cpwd_timer.function = cpwd_brokentimer; | ||
616 | cpwd_timer.data = (unsigned long) p; | ||
617 | cpwd_timer.expires = WD_BTIMEOUT; | 615 | cpwd_timer.expires = WD_BTIMEOUT; |
618 | 616 | ||
619 | pr_info("PLD defect workaround enabled for model %s\n", | 617 | pr_info("PLD defect workaround enabled for model %s\n", |