openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

watchdog: WatchDog Timer Driver Core - use passed watchdog_device 

Use the passed watchdog_device instead of the static global variable when
testing and setting the status in watchdog_ping, watchdog_start, and
watchdog_stop.  Note that the callers of these functions are actually
passing the static global variable.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
This commit is contained in:
H Hartley Sweeten 2011-08-03 15:38:20 -07:00 committed by Wim Van Sebroeck
parent 9d037a7776
commit cb7efc02c6
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/watchdog/watchdog_dev.c
View File

@ -59,7 +59,7 @@ static struct watchdog_device *wdd;
static int watchdog_ping(struct watchdog_device *wddev)
{
if (test_bit(WDOG_ACTIVE, &wdd->status)) {
if (test_bit(WDOG_ACTIVE, &wddev->status)) {
if (wddev->ops->ping)
return wddev->ops->ping(wddev); /* ping the watchdog */
else
@ -81,12 +81,12 @@ static int watchdog_start(struct watchdog_device *wddev)
{
int err;
if (!test_bit(WDOG_ACTIVE, &wdd->status)) {
if (!test_bit(WDOG_ACTIVE, &wddev->status)) {
err = wddev->ops->start(wddev);
if (err < 0)
return err;
set_bit(WDOG_ACTIVE, &wdd->status);
set_bit(WDOG_ACTIVE, &wddev->status);
}
return 0;
}
@ -105,18 +105,18 @@ static int watchdog_stop(struct watchdog_device *wddev)
{
int err = -EBUSY;
if (test_bit(WDOG_NO_WAY_OUT, &wdd->status)) {
if (test_bit(WDOG_NO_WAY_OUT, &wddev->status)) {
pr_info("%s: nowayout prevents watchdog to be stopped!\n",
wdd->info->identity);
wddev->info->identity);
return err;
}
if (test_bit(WDOG_ACTIVE, &wdd->status)) {
if (test_bit(WDOG_ACTIVE, &wddev->status)) {
err = wddev->ops->stop(wddev);
if (err < 0)
return err;
clear_bit(WDOG_ACTIVE, &wdd->status);
clear_bit(WDOG_ACTIVE, &wddev->status);
}
return 0;
}