Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aee334c2 authored by Alan Cox's avatar Alan Cox Committed by Wim Van Sebroeck
Browse files

[WATCHDOG 31/57] pc87413_wdt: clean up, coding style, unlocked_ioctl 



Review and switch to unlocked_ioctl

Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent 12b9df7d

drivers/watchdog/pc87413_wdt.c

+87 −124
Original line number Diff line number Diff line
@@ -31,9 +31,9 @@ 
#include <linux/spinlock.h>

#include <linux/moduleparam.h>

#include <linux/version.h>

#include <linux/io.h>

#include <linux/uaccess.h>



#include <asm/io.h>

#include <asm/uaccess.h>

#include <asm/system.h>



/* #define DEBUG 1 */
@@ -57,11 +57,11 @@ 
static int io = 0x2E;		         /* Address used on Portwell Boards */



static int timeout = DEFAULT_TIMEOUT;   /* timeout value */

static unsigned long timer_enabled = 0;  /* is the timer enabled? */

static unsigned long timer_enabled;	/* is the timer enabled? */



static char expect_close;		/* is the close expected? */



static DEFINE_SPINLOCK(io_lock);/* to guard the watchdog from io races */

static DEFINE_SPINLOCK(io_lock);	/* to guard us from io races */



static int nowayout = WATCHDOG_NOWAYOUT;
@@ -85,8 +85,9 @@ static inline void pc87413_select_wdt_out (void) 
	outb_p(cr_data, WDT_DATA_IO_PORT);



#ifdef DEBUG

	printk(KERN_INFO DPFX "Select multiple pin,pin55,as WDT output:"

	                      " Bit7 to 1: %d\n", cr_data);

	printk(KERN_INFO DPFX

		"Select multiple pin,pin55,as WDT output: Bit7 to 1: %d\n",

								cr_data);

#endif

}
@@ -129,12 +130,11 @@ static inline unsigned int pc87413_get_swc_base(void) 
	addr_l = inb(WDT_DATA_IO_PORT);



	swc_base_addr = (addr_h << 8) + addr_l;



#ifdef DEBUG

	printk(KERN_INFO DPFX "Read SWC I/O Base Address: low %d, high %d,"

	                      " res %d\n", addr_l, addr_h, swc_base_addr);

	printk(KERN_INFO DPFX

		"Read SWC I/O Base Address: low %d, high %d, res %d\n",

						addr_l, addr_h, swc_base_addr);

#endif



	return swc_base_addr;

}
@@ -143,9 +143,7 @@ static inline unsigned int pc87413_get_swc_base(void) 
static inline void pc87413_swc_bank3(unsigned int swc_base_addr)

{

	/* Step 4: Select Bank3 of SWC */



	outb_p(inb(swc_base_addr + 0x0f) | 0x03, swc_base_addr + 0x0f);



#ifdef DEBUG

	printk(KERN_INFO DPFX "Select Bank3 of SWC\n");

#endif
@@ -157,9 +155,7 @@ static inline void pc87413_programm_wdto(unsigned int swc_base_addr, 
					 char pc87413_time)

{

	/* Step 5: Programm WDTO, Twd. */



	outb_p(pc87413_time, swc_base_addr + WDTO);



#ifdef DEBUG

	printk(KERN_INFO DPFX "Set WDTO to %d minutes\n", pc87413_time);

#endif
@@ -170,9 +166,7 @@ static inline void pc87413_programm_wdto(unsigned int swc_base_addr, 
static inline void pc87413_enable_wden(unsigned int swc_base_addr)

{

	/* Step 6: Enable WDEN */



	outb_p(inb(swc_base_addr + WDCTL) | 0x01, swc_base_addr + WDCTL);



#ifdef DEBUG

	printk(KERN_INFO DPFX "Enable WDEN\n");

#endif
@@ -182,9 +176,7 @@ static inline void pc87413_enable_wden(unsigned int swc_base_addr) 
static inline void pc87413_enable_sw_wd_tren(unsigned int swc_base_addr)

{

	/* Enable SW_WD_TREN */



	outb_p(inb(swc_base_addr + WDCFG) | 0x80, swc_base_addr + WDCFG);



#ifdef DEBUG

	printk(KERN_INFO DPFX "Enable SW_WD_TREN\n");

#endif
@@ -195,9 +187,7 @@ static inline void pc87413_enable_sw_wd_tren(unsigned int swc_base_addr) 
static inline void pc87413_disable_sw_wd_tren(unsigned int swc_base_addr)

{

	/* Disable SW_WD_TREN */



	outb_p(inb(swc_base_addr + WDCFG) & 0x7f, swc_base_addr + WDCFG);



#ifdef DEBUG

	printk(KERN_INFO DPFX "pc87413 - Disable SW_WD_TREN\n");

#endif
@@ -208,9 +198,7 @@ static inline void pc87413_disable_sw_wd_tren(unsigned int swc_base_addr) 
static inline void pc87413_enable_sw_wd_trg(unsigned int swc_base_addr)

{

	/* Enable SW_WD_TRG */



	outb_p(inb(swc_base_addr + WDCTL) | 0x80, swc_base_addr + WDCTL);



#ifdef DEBUG

	printk(KERN_INFO DPFX "pc87413 - Enable SW_WD_TRG\n");

#endif
@@ -221,9 +209,7 @@ static inline void pc87413_enable_sw_wd_trg(unsigned int swc_base_addr) 
static inline void pc87413_disable_sw_wd_trg(unsigned int swc_base_addr)

{

	/* Disable SW_WD_TRG */



	outb_p(inb(swc_base_addr + WDCTL) & 0x7f, swc_base_addr + WDCTL);



#ifdef DEBUG

	printk(KERN_INFO DPFX "Disable SW_WD_TRG\n");

#endif
@@ -314,8 +300,8 @@ static int pc87413_open(struct inode *inode, struct file *file) 
	/* Reload and activate timer */

	pc87413_refresh();



	printk(KERN_INFO MODNAME "Watchdog enabled. Timeout set to"

	                         " %d minute(s).\n", timeout);

	printk(KERN_INFO MODNAME

		"Watchdog enabled. Timeout set to %d minute(s).\n", timeout);



	return nonseekable_open(inode, file);

}
@@ -338,17 +324,15 @@ static int pc87413_release(struct inode *inode, struct file *file) 


	if (expect_close == 42) {

		pc87413_disable();

		printk(KERN_INFO MODNAME "Watchdog disabled,"

		                         " sleeping again...\n");

		printk(KERN_INFO MODNAME

				"Watchdog disabled, sleeping again...\n");

	} else {

		printk(KERN_CRIT MODNAME "Unexpected close, not stopping"

		                         " watchdog!\n");

		printk(KERN_CRIT MODNAME

				"Unexpected close, not stopping watchdog!\n");

		pc87413_refresh();

	}



	clear_bit(0, &timer_enabled);

	expect_close = 0;



	return 0;

}
@@ -386,7 +370,8 @@ static ssize_t pc87413_write(struct file *file, const char __user *data, 
			/* reset expect flag */

			expect_close = 0;



			/* scan to see whether or not we got the magic character */

			/* scan to see whether or not we got the

			   magic character */

			for (i = 0; i != len; i++) {

				char c;

				if (get_user(c, data+i))
@@ -404,7 +389,6 @@ static ssize_t pc87413_write(struct file *file, const char __user *data, 


/**

 *	pc87413_ioctl:

 *	@inode: inode of the device

 *	@file: file handle to the device

 *	@cmd: watchdog command

 *	@arg: argument pointer
@@ -414,8 +398,8 @@ static ssize_t pc87413_write(struct file *file, const char __user *data, 
 *	querying capabilities and current status.

 */



static int pc87413_ioctl(struct inode *inode, struct file *file,

			 unsigned int cmd, unsigned long arg)

static long pc87413_ioctl(struct file *file, unsigned int cmd,

						unsigned long arg)

{

	int new_timeout;
@@ -435,66 +419,49 @@ static int pc87413_ioctl(struct inode *inode, struct file *file, 
	uarg.i = (int __user *)arg;



	switch (cmd) {

		default:

			return -ENOTTY;



	case WDIOC_GETSUPPORT:

		return copy_to_user(uarg.ident, &ident,

					sizeof(ident)) ? -EFAULT : 0;



	case WDIOC_GETSTATUS:

		return put_user(pc87413_status(), uarg.i);



	case WDIOC_GETBOOTSTATUS:

		return put_user(0, uarg.i);



	case WDIOC_KEEPALIVE:

		pc87413_refresh();

#ifdef DEBUG

		printk(KERN_INFO DPFX "keepalive\n");

#endif

		return 0;



	case WDIOC_SETTIMEOUT:

		if (get_user(new_timeout, uarg.i))

			return -EFAULT;



			// the API states this is given in secs

		/* the API states this is given in secs */

		new_timeout /= 60;



		if (new_timeout < 0 || new_timeout > MAX_TIMEOUT)

			return -EINVAL;



		timeout = new_timeout;

		pc87413_refresh();



			// fall through and return the new timeout...



		/* fall through and return the new timeout... */

	case WDIOC_GETTIMEOUT:



		new_timeout = timeout * 60;



		return put_user(new_timeout, uarg.i);



	case WDIOC_SETOPTIONS:

	{

		int options, retval = -EINVAL;



		if (get_user(options, uarg.i))

			return -EFAULT;



		if (options & WDIOS_DISABLECARD) {

			pc87413_disable();

			retval = 0;

		}



		if (options & WDIOS_ENABLECARD) {

			pc87413_enable();

			retval = 0;

		}



		return retval;

	}

	default:

		return -ENOTTY;

	}

}
@@ -517,10 +484,8 @@ static int pc87413_notify_sys(struct notifier_block *this, 
			      void *unused)

{

	if (code == SYS_DOWN || code == SYS_HALT)

	{

		/* Turn the card off */

		pc87413_disable();

	}

	return NOTIFY_DONE;

}
@@ -530,18 +495,16 @@ static const struct file_operations pc87413_fops = { 
	.owner		= THIS_MODULE,

	.llseek		= no_llseek,

	.write		= pc87413_write,

	.ioctl		= pc87413_ioctl,

	.unlocked_ioctl	= pc87413_ioctl,

	.open		= pc87413_open,

	.release	= pc87413_release,

};



static struct notifier_block pc87413_notifier =

{

static struct notifier_block pc87413_notifier = {

	.notifier_call  = pc87413_notify_sys,

};



static struct miscdevice pc87413_miscdev=

{

static struct miscdevice pc87413_miscdev = {

	.minor          = WATCHDOG_MINOR,

	.name           = "watchdog",

	.fops           = &pc87413_fops
@@ -561,29 +524,26 @@ static int __init pc87413_init(void) 
{

	int ret;



	printk(KERN_INFO PFX "Version " VERSION " at io 0x%X\n", WDT_INDEX_IO_PORT);

	printk(KERN_INFO PFX "Version " VERSION " at io 0x%X\n",

							WDT_INDEX_IO_PORT);



	/* request_region(io, 2, "pc87413"); */



	ret = register_reboot_notifier(&pc87413_notifier);

	if (ret != 0) {

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

			ret);

		printk(KERN_ERR PFX

			"cannot register reboot notifier (err=%d)\n", ret);

	}



	ret = misc_register(&pc87413_miscdev);



	if (ret != 0) {

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

			WATCHDOG_MINOR, ret);

		unregister_reboot_notifier(&pc87413_notifier);

		return ret;

	}



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



	pc87413_enable();



	return 0;

}
@@ -600,8 +560,7 @@ static int __init pc87413_init(void) 
static void __exit pc87413_exit(void)

{

	/* Stop the timer before we leave */

	if (!nowayout)

	{

	if (!nowayout) {

		pc87413_disable();

		printk(KERN_INFO MODNAME "Watchdog disabled.\n");

	}
@@ -626,8 +585,12 @@ module_param(io, int, 0); 
MODULE_PARM_DESC(io, MODNAME " I/O port (default: " __MODULE_STRING(io) ").");



module_param(timeout, int, 0);

MODULE_PARM_DESC(timeout, "Watchdog timeout in minutes (default=" __MODULE_STRING(timeout) ").");

MODULE_PARM_DESC(timeout,

		"Watchdog timeout in minutes (default="

				__MODULE_STRING(timeout) ").");



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) ")");