Skip to content

Commit

Permalink
[WATCHDOG] advantechwdt.c - convert to platform_device part 2
Browse files Browse the repository at this point in the history
Convert the reboot_notifier into the platform_device's shutdown
method

Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
  • Loading branch information
Wim Van Sebroeck committed Jan 11, 2007
1 parent c2bd11c commit 2e9c9cf
Showing 1 changed file with 9 additions and 37 deletions.
46 changes: 9 additions & 37 deletions drivers/char/watchdog/advantechwdt.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@
#include <linux/watchdog.h>
#include <linux/fs.h>
#include <linux/ioport.h>
#include <linux/notifier.h>
#include <linux/reboot.h>
#include <linux/platform_device.h>
#include <linux/init.h>

Expand Down Expand Up @@ -224,21 +222,6 @@ advwdt_close(struct inode *inode, struct file *file)
return 0;
}

/*
* Notifier for system down
*/

static int
advwdt_notify_sys(struct notifier_block *this, unsigned long code,
void *unused)
{
if (code == SYS_DOWN || code == SYS_HALT) {
/* Turn the WDT off */
advwdt_disable();
}
return NOTIFY_DONE;
}

/*
* Kernel Interfaces
*/
Expand All @@ -258,15 +241,6 @@ static struct miscdevice advwdt_miscdev = {
.fops = &advwdt_fops,
};

/*
* The WDT needs to learn about soft shutdowns in order to
* turn the timebomb registers off.
*/

static struct notifier_block advwdt_notifier = {
.notifier_call = advwdt_notify_sys,
};

/*
* Init & exit routines
*/
Expand Down Expand Up @@ -299,27 +273,18 @@ advwdt_probe(struct platform_device *dev)
timeout);
}

ret = register_reboot_notifier(&advwdt_notifier);
if (ret != 0) {
printk (KERN_ERR PFX "cannot register reboot notifier (err=%d)\n",
ret);
goto unreg_regions;
}

ret = misc_register(&advwdt_miscdev);
if (ret != 0) {
printk (KERN_ERR PFX "cannot register miscdev on minor=%d (err=%d)\n",
WATCHDOG_MINOR, ret);
goto unreg_reboot;
goto unreg_regions;
}

printk (KERN_INFO PFX "initialized. timeout=%d sec (nowayout=%d)\n",
timeout, nowayout);

out:
return ret;
unreg_reboot:
unregister_reboot_notifier(&advwdt_notifier);
unreg_regions:
release_region(wdt_start, 1);
unreg_stop:
Expand All @@ -332,17 +297,24 @@ static int __devexit
advwdt_remove(struct platform_device *dev)
{
misc_deregister(&advwdt_miscdev);
unregister_reboot_notifier(&advwdt_notifier);
release_region(wdt_start,1);
if(wdt_stop != wdt_start)
release_region(wdt_stop,1);

return 0;
}

static void
advwdt_shutdown(struct platform_device *dev)
{
/* Turn the WDT off if we have a soft shutdown */
advwdt_disable();
}

static struct platform_driver advwdt_driver = {
.probe = advwdt_probe,
.remove = __devexit_p(advwdt_remove),
.shutdown = advwdt_shutdown,
.driver = {
.owner = THIS_MODULE,
.name = DRV_NAME,
Expand Down

0 comments on commit 2e9c9cf

Please sign in to comment.