[WATCHDOG 51/57] w83877f_wdt: clean up code, coding style, switch to unlocked_ioctl (c1cfd1a2) · Commits · jan.koester / Linux

drivers/watchdog/w83877f_wdt.c

+101 −98

Original line number	Original line	Diff line number	Diff line
	@@ -23,13 +23,16 @@
	* Added KERN_* tags to printks		* Added KERN_* tags to printks
	* add CONFIG_WATCHDOG_NOWAYOUT support		* add CONFIG_WATCHDOG_NOWAYOUT support
	* fix possible wdt_is_open race		* fix possible wdt_is_open race
	* changed watchdog_info to correctly reflect what the driver offers		* changed watchdog_info to correctly reflect what
	* added WDIOC_GETSTATUS, WDIOC_GETBOOTSTATUS, WDIOC_SETTIMEOUT,		* the driver offers
			* added WDIOC_GETSTATUS, WDIOC_GETBOOTSTATUS,
			* WDIOC_SETTIMEOUT,
	* WDIOC_GETTIMEOUT, and WDIOC_SETOPTIONS ioctls		* WDIOC_GETTIMEOUT, and WDIOC_SETOPTIONS ioctls
	* 09/8 - 2003 [wim@iguana.be] cleanup of trailing spaces		* 09/8 - 2003 [wim@iguana.be] cleanup of trailing spaces
	* added extra printk's for startup problems		* added extra printk's for startup problems
	* use module_param		* use module_param
	* made timeout (the emulated heartbeat) a module_param		* made timeout (the emulated heartbeat) a
			* module_param
	* made the keepalive ping an internal subroutine		* made the keepalive ping an internal subroutine
	*		*
	* This WDT driver is different from most other Linux WDT		* This WDT driver is different from most other Linux WDT
	@@ -51,8 +54,8 @@
	#include <linux/notifier.h>		#include <linux/notifier.h>
	#include <linux/reboot.h>		#include <linux/reboot.h>
	#include <linux/init.h>		#include <linux/init.h>
	#include <asm/io.h>		#include <linux/io.h>
	#include <asm/uaccess.h>		#include <linux/uaccess.h>
	#include <asm/system.h>		#include <asm/system.h>

	#define OUR_NAME "w83877f_wdt"		#define OUR_NAME "w83877f_wdt"
	@@ -80,14 +83,19 @@
	*/		*/

	#define WATCHDOG_TIMEOUT 30 /* 30 sec default timeout */		#define WATCHDOG_TIMEOUT 30 /* 30 sec default timeout */
	static int timeout = WATCHDOG_TIMEOUT; /* in seconds, will be multiplied by HZ to get seconds to wait for a ping */		/* in seconds, will be multiplied by HZ to get seconds to wait for a ping */
			static int timeout = WATCHDOG_TIMEOUT;
	module_param(timeout, int, 0);		module_param(timeout, int, 0);
	MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. (1<=timeout<=3600, default=" __MODULE_STRING(WATCHDOG_TIMEOUT) ")");		MODULE_PARM_DESC(timeout,
			"Watchdog timeout in seconds. (1<=timeout<=3600, default="
			__MODULE_STRING(WATCHDOG_TIMEOUT) ")");


	static int nowayout = WATCHDOG_NOWAYOUT;		static int nowayout = WATCHDOG_NOWAYOUT;
	module_param(nowayout, int, 0);		module_param(nowayout, int, 0);
	MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");		MODULE_PARM_DESC(nowayout,
			"Watchdog cannot be stopped once started (default="
			__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");

	static void wdt_timer_ping(unsigned long);		static void wdt_timer_ping(unsigned long);
	static DEFINE_TIMER(timer, wdt_timer_ping, 0, 0);		static DEFINE_TIMER(timer, wdt_timer_ping, 0, 0);
	@@ -105,8 +113,7 @@ static void wdt_timer_ping(unsigned long data)
	/* If we got a heartbeat pulse within the WDT_US_INTERVAL		/* If we got a heartbeat pulse within the WDT_US_INTERVAL
	* we agree to ping the WDT		* we agree to ping the WDT
	*/		*/
	if(time_before(jiffies, next_heartbeat))		if (time_before(jiffies, next_heartbeat)) {
	{
	/* Ping the WDT */		/* Ping the WDT */
	spin_lock(&wdt_spinlock);		spin_lock(&wdt_spinlock);

	@@ -118,9 +125,9 @@ static void wdt_timer_ping(unsigned long data)

	spin_unlock(&wdt_spinlock);		spin_unlock(&wdt_spinlock);

	} else {		} else
	printk(KERN_WARNING PFX "Heartbeat lost! Will not ping the watchdog\n");		printk(KERN_WARNING PFX
	}		"Heartbeat lost! Will not ping the watchdog\n");
	}		}

	/*		/*
	@@ -181,22 +188,21 @@ static void wdt_keepalive(void)
	* /dev/watchdog handling		* /dev/watchdog handling
	*/		*/

	static ssize_t fop_write(struct file * file, const char __user * buf, size_t count, loff_t * ppos)		static ssize_t fop_write(struct file file, const char __user buf,
			size_t count, loff_t *ppos)
	{		{
	/* See if we got the magic character 'V' and reload the timer */		/* See if we got the magic character 'V' and reload the timer */
	if(count)		if (count) {
	{		if (!nowayout) {
	if (!nowayout)
	{
	size_t ofs;		size_t ofs;

	/* note: just in case someone wrote the magic character		/* note: just in case someone wrote the magic
	* five months ago... */		character five months ago... */
	wdt_expect_close = 0;		wdt_expect_close = 0;

	/* scan to see whether or not we got the magic character */		/* scan to see whether or not we got the
	for(ofs = 0; ofs != count; ofs++)		magic character */
	{		for (ofs = 0; ofs != count; ofs++) {
	char c;		char c;
	if (get_user(c, buf + ofs))		if (get_user(c, buf + ofs))
	return -EFAULT;		return -EFAULT;
	@@ -228,27 +234,26 @@ static int fop_close(struct inode * inode, struct file * file)
	wdt_turnoff();		wdt_turnoff();
	else {		else {
	del_timer(&timer);		del_timer(&timer);
	printk(KERN_CRIT PFX "device file closed unexpectedly. Will not stop the WDT!\n");		printk(KERN_CRIT PFX
			"device file closed unexpectedly. Will not stop the WDT!\n");
	}		}
	clear_bit(0, &wdt_is_open);		clear_bit(0, &wdt_is_open);
	wdt_expect_close = 0;		wdt_expect_close = 0;
	return 0;		return 0;
	}		}

	static int fop_ioctl(struct inode inode, struct file file, unsigned int cmd,		static long fop_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
	unsigned long arg)
	{		{
	void __user argp = (void __user )arg;		void __user argp = (void __user )arg;
	int __user *p = argp;		int __user *p = argp;
	static struct watchdog_info ident=		static const struct watchdog_info ident = {
	{		.options = WDIOF_KEEPALIVEPING \| WDIOF_SETTIMEOUT
	.options = WDIOF_KEEPALIVEPING \| WDIOF_SETTIMEOUT \| WDIOF_MAGICCLOSE,		\| WDIOF_MAGICCLOSE,
	.firmware_version = 1,		.firmware_version = 1,
	.identity = "W83877F",		.identity = "W83877F",
	};		};

	switch(cmd)		switch (cmd) {
	{
	default:		default:
	return -ENOTTY;		return -ENOTTY;
	case WDIOC_GETSUPPORT:		case WDIOC_GETSUPPORT:
	@@ -285,7 +290,8 @@ static int fop_ioctl(struct inode inode, struct file file, unsigned int cmd,
	if (get_user(new_timeout, p))		if (get_user(new_timeout, p))
	return -EFAULT;		return -EFAULT;

	if(new_timeout < 1 \|\| new_timeout > 3600) /* arbitrary upper limit */		/* arbitrary upper limit */
			if (new_timeout < 1 \|\| new_timeout > 3600)
	return -EINVAL;		return -EINVAL;

	timeout = new_timeout;		timeout = new_timeout;
	@@ -303,7 +309,7 @@ static const struct file_operations wdt_fops = {
	.write = fop_write,		.write = fop_write,
	.open = fop_open,		.open = fop_open,
	.release = fop_close,		.release = fop_close,
	.ioctl = fop_ioctl,		.unlocked_ioctl = fop_ioctl,
	};		};

	static struct miscdevice wdt_miscdev = {		static struct miscdevice wdt_miscdev = {
	@@ -329,8 +335,7 @@ static int wdt_notify_sys(struct notifier_block *this, unsigned long code,
	* turn the timebomb registers off.		* turn the timebomb registers off.
	*/		*/

	static struct notifier_block wdt_notifier=		static struct notifier_block wdt_notifier = {
	{
	.notifier_call = wdt_notify_sys,		.notifier_call = wdt_notify_sys,
	};		};

	@@ -350,23 +355,21 @@ static int __init w83877f_wdt_init(void)
	{		{
	int rc = -EBUSY;		int rc = -EBUSY;

	if(timeout < 1 \|\| timeout > 3600) /* arbitrary upper limit */		if (timeout < 1 \|\| timeout > 3600) { /* arbitrary upper limit */
	{
	timeout = WATCHDOG_TIMEOUT;		timeout = WATCHDOG_TIMEOUT;
	printk(KERN_INFO PFX "timeout value must be 1<=x<=3600, using %d\n",		printk(KERN_INFO PFX
			"timeout value must be 1 <= x <= 3600, using %d\n",
	timeout);		timeout);
	}		}

	if (!request_region(ENABLE_W83877F_PORT, 2, "W83877F WDT"))		if (!request_region(ENABLE_W83877F_PORT, 2, "W83877F WDT")) {
	{
	printk(KERN_ERR PFX "I/O address 0x%04x already in use\n",		printk(KERN_ERR PFX "I/O address 0x%04x already in use\n",
	ENABLE_W83877F_PORT);		ENABLE_W83877F_PORT);
	rc = -EIO;		rc = -EIO;
	goto err_out;		goto err_out;
	}		}

	if (!request_region(WDT_PING, 1, "W8387FF WDT"))		if (!request_region(WDT_PING, 1, "W8387FF WDT")) {
	{
	printk(KERN_ERR PFX "I/O address 0x%04x already in use\n",		printk(KERN_ERR PFX "I/O address 0x%04x already in use\n",
	WDT_PING);		WDT_PING);
	rc = -EIO;		rc = -EIO;
	@@ -374,22 +377,22 @@ static int __init w83877f_wdt_init(void)
	}		}

	rc = register_reboot_notifier(&wdt_notifier);		rc = register_reboot_notifier(&wdt_notifier);
	if (rc)		if (rc) {
	{		printk(KERN_ERR PFX
	printk(KERN_ERR PFX "cannot register reboot notifier (err=%d)\n",		"cannot register reboot notifier (err=%d)\n", rc);
	rc);
	goto err_out_region2;		goto err_out_region2;
	}		}

	rc = misc_register(&wdt_miscdev);		rc = misc_register(&wdt_miscdev);
	if (rc)		if (rc) {
	{		printk(KERN_ERR PFX
	printk(KERN_ERR PFX "cannot register miscdev on minor=%d (err=%d)\n",		"cannot register miscdev on minor=%d (err=%d)\n",
	wdt_miscdev.minor, rc);		wdt_miscdev.minor, rc);
	goto err_out_reboot;		goto err_out_reboot;
	}		}

	printk(KERN_INFO PFX "WDT driver for W83877F initialised. timeout=%d sec (nowayout=%d)\n",		printk(KERN_INFO PFX
			"WDT driver for W83877F initialised. timeout=%d sec (nowayout=%d)\n",
	timeout, nowayout);		timeout, nowayout);

	return 0;		return 0;