public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[WATCHDOG] ib700wdt.c clean-up init and exit routines

Browse source 
clean-up the init and exit routines so that they use
the same sequence.

Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
This commit is contained in:
Wim Van Sebroeck 2007-01-27 21:58:08 +01:00
parent 35d55c9431
commit f6e4803969
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
drivers/char/watchdog/ib700wdt.c
View file

@ -300,6 +300,10 @@ static struct notifier_block ibwdt_notifier = {
.notifier_call = ibwdt_notify_sys, .notifier_call = ibwdt_notify_sys,
}; };
/*
* Init & exit routines
*/
static int __init ibwdt_init(void) static int __init ibwdt_init(void)
{ {
int res; int res;
@ -307,11 +311,6 @@ static int __init ibwdt_init(void)
printk(KERN_INFO PFX "WDT driver for IB700 single board computer initialising.\n"); printk(KERN_INFO PFX "WDT driver for IB700 single board computer initialising.\n");
spin_lock_init(&ibwdt_lock); spin_lock_init(&ibwdt_lock);
res = misc_register(&ibwdt_miscdev);
if (res) {
printk (KERN_ERR PFX "failed to register misc device\n");
goto out_nomisc;
}
#if WDT_START != WDT_STOP #if WDT_START != WDT_STOP
if (!request_region(WDT_STOP, 1, "IB700 WDT")) { if (!request_region(WDT_STOP, 1, "IB700 WDT")) {
@ -326,13 +325,22 @@ static int __init ibwdt_init(void)
res = -EIO; res = -EIO;
goto out_nostartreg; goto out_nostartreg;
} }
res = register_reboot_notifier(&ibwdt_notifier); res = register_reboot_notifier(&ibwdt_notifier);
if (res) { if (res) {
printk (KERN_ERR PFX "Failed to register reboot notifier.\n"); printk (KERN_ERR PFX "Failed to register reboot notifier.\n");
goto out_noreboot; goto out_noreboot;
} }
res = misc_register(&ibwdt_miscdev);
if (res) {
printk (KERN_ERR PFX "failed to register misc device\n");
goto out_nomisc;
}
return 0; return 0;
out_nomisc:
unregister_reboot_notifier(&ibwdt_notifier);
out_noreboot: out_noreboot:
release_region(WDT_START, 1); release_region(WDT_START, 1);
out_nostartreg: out_nostartreg:
@ -340,8 +348,6 @@ out_nostartreg:
release_region(WDT_STOP, 1); release_region(WDT_STOP, 1);
#endif #endif
out_nostopreg: out_nostopreg:
misc_deregister(&ibwdt_miscdev);
out_nomisc:
return res; return res;
} }
@ -350,10 +356,10 @@ ibwdt_exit(void)
{ {
misc_deregister(&ibwdt_miscdev); misc_deregister(&ibwdt_miscdev);
unregister_reboot_notifier(&ibwdt_notifier); unregister_reboot_notifier(&ibwdt_notifier);
release_region(WDT_START,1);
#if WDT_START != WDT_STOP #if WDT_START != WDT_STOP
release_region(WDT_STOP,1); release_region(WDT_STOP,1);
#endif #endif
release_region(WDT_START,1);
} }
module_init(ibwdt_init); module_init(ibwdt_init);