Commit 8561b089 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog 

* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  [WATCHDOG] constify function pointer tables
  [WATCHDOG] TXx9 watchdog driver
  [WATCHDOG] misc_register patch	
  [WATCHDOG] wdt: fix locking
parents e189f349 b47a166e

drivers/watchdog/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -639,6 +639,12 @@ config AR7_WDT 
	help

	  Hardware driver for the TI AR7 Watchdog Timer.



config TXX9_WDT

	tristate "Toshiba TXx9 Watchdog Timer"

	depends on CPU_TX39XX || CPU_TX49XX

	help

	  Hardware driver for the built-in watchdog timer on TXx9 MIPS SoCs.



# PARISC Architecture



# POWERPC Architecture

drivers/watchdog/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ obj-$(CONFIG_INDYDOG) += indydog.o 
obj-$(CONFIG_WDT_MTX1)	+= mtx-1_wdt.o

obj-$(CONFIG_WDT_RM9K_GPI) += rm9k_wdt.o

obj-$(CONFIG_AR7_WDT) += ar7_wdt.o

obj-$(CONFIG_TXX9_WDT) += txx9wdt.o



# PARISC Architecture

drivers/watchdog/alim1535_wdt.c

+10 −10
Original line number Diff line number Diff line
@@ -413,18 +413,18 @@ static int __init watchdog_init(void) 
	/* Calculate the watchdog's timeout */

	ali_settimer(timeout);



	ret = misc_register(&ali_miscdev);

	ret = register_reboot_notifier(&ali_notifier);

	if (ret != 0) {

		printk(KERN_ERR PFX "cannot register miscdev on minor=%d (err=%d)\n",

			WATCHDOG_MINOR, ret);

		printk(KERN_ERR PFX "cannot register reboot notifier (err=%d)\n",

			ret);

		goto out;

	}



	ret = register_reboot_notifier(&ali_notifier);

	ret = misc_register(&ali_miscdev);

	if (ret != 0) {

		printk(KERN_ERR PFX "cannot register reboot notifier (err=%d)\n",

			ret);

		goto unreg_miscdev;

		printk(KERN_ERR PFX "cannot register miscdev on minor=%d (err=%d)\n",

			WATCHDOG_MINOR, ret);

		goto unreg_reboot;

	}



	printk(KERN_INFO PFX "initialized. timeout=%d sec (nowayout=%d)\n",
@@ -432,8 +432,8 @@ static int __init watchdog_init(void) 


out:

	return ret;

unreg_miscdev:

	misc_deregister(&ali_miscdev);

unreg_reboot:

	unregister_reboot_notifier(&ali_notifier);

	goto out;

}
@@ -449,8 +449,8 @@ static void __exit watchdog_exit(void) 
	ali_stop();



	/* Deregister */

	unregister_reboot_notifier(&ali_notifier);

	misc_deregister(&ali_miscdev);

	unregister_reboot_notifier(&ali_notifier);

	pci_dev_put(ali_pci);

}

drivers/watchdog/alim7101_wdt.c

+9 −9
Original line number Diff line number Diff line
@@ -377,18 +377,18 @@ static int __init alim7101_wdt_init(void) 
			timeout);

	}



	rc = misc_register(&wdt_miscdev);

	rc = register_reboot_notifier(&wdt_notifier);

	if (rc) {

		printk(KERN_ERR PFX "cannot register miscdev on minor=%d (err=%d)\n",

			wdt_miscdev.minor, rc);

		printk(KERN_ERR PFX "cannot register reboot notifier (err=%d)\n",

			rc);

		goto err_out;

	}



	rc = register_reboot_notifier(&wdt_notifier);

	rc = misc_register(&wdt_miscdev);

	if (rc) {

		printk(KERN_ERR PFX "cannot register reboot notifier (err=%d)\n",

			rc);

		goto err_out_miscdev;

		printk(KERN_ERR PFX "cannot register miscdev on minor=%d (err=%d)\n",

			wdt_miscdev.minor, rc);

		goto err_out_reboot;

	}



	if (nowayout) {
@@ -399,8 +399,8 @@ static int __init alim7101_wdt_init(void) 
		timeout, nowayout);

	return 0;



err_out_miscdev:

	misc_deregister(&wdt_miscdev);

err_out_reboot:

	unregister_reboot_notifier(&wdt_notifier);

err_out:

	pci_dev_put(alim7101_pmu);

	return rc;

drivers/watchdog/ar7_wdt.c

+1 −1
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ static int ar7_wdt_ioctl(struct inode *inode, struct file *file, 
	}

}



static struct file_operations ar7_wdt_fops = {

static const struct file_operations ar7_wdt_fops = {

	.owner		= THIS_MODULE,

	.write		= ar7_wdt_write,

	.ioctl		= ar7_wdt_ioctl,