A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-28 10:41:38 -04:00
Code Issues Projects Releases Packages Wiki Activity

watchdog: omap: use watchdog_init_timeout instead of open coding it

Browse source 
Instead of (partly) open coding watchdog_init_timeout to determine the
inital timeout use the core function that exists for exactly this
purpose.

As a side effect the "timeout-sec" device-tree property is recognized now
(though currently unused in the omap device trees).

Signed-off-by: Uwe Kleine-König <[email protected]>
Reviewed-by: Guenter Roeck <[email protected]>
Signed-off-by: Wim Van Sebroeck <[email protected]>
This commit is contained in:
Uwe Kleine-König 2015-04-27 11:22:59 +02:00 • committed by Wim Van Sebroeck
commit a4f741e3e1
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
drivers/watchdog/omap_wdt.c
View file

@ -234,10 +234,7 @@ static int omap_wdt_probe(struct platform_device *pdev)
omap_wdt->min_timeout = TIMER_MARGIN_MIN;
omap_wdt->max_timeout = TIMER_MARGIN_MAX;
if (timer_margin >= TIMER_MARGIN_MIN &&
timer_margin <= TIMER_MARGIN_MAX)
omap_wdt->timeout = timer_margin;
else
if (watchdog_init_timeout(omap_wdt, timer_margin, &pdev->dev) < 0)
omap_wdt->timeout = TIMER_MARGIN_DEFAULT;
watchdog_set_drvdata(omap_wdt, wdev);