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

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

[WATCHDOG 55/57] wdt285: switch to unlocked_ioctl and tidy up oddments of coding style 



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 dae67a28

drivers/watchdog/wdt285.c

+16 −15
Original line number Original line Diff line number Diff line
@@ -26,9 +26,9 @@ 
#include <linux/reboot.h>

#include <linux/reboot.h>

#include <linux/init.h>

#include <linux/init.h>

#include <linux/interrupt.h>

#include <linux/interrupt.h>

#include <linux/uaccess.h>

#include <linux/irq.h>





#include <asm/irq.h>

#include <asm/uaccess.h>

#include <asm/hardware.h>

#include <asm/hardware.h>

#include <asm/mach-types.h>

#include <asm/mach-types.h>

#include <asm/hardware/dec21285.h>

#include <asm/hardware/dec21285.h>
@@ -115,8 +115,8 @@ static int watchdog_release(struct inode *inode, struct file *file) 
	return 0;

	return 0;

}

}





static ssize_t

static ssize_t watchdog_write(struct file *file, const char *data,

watchdog_write(struct file *file, const char *data, size_t len, loff_t *ppos)

						size_t len, loff_t *ppos)

{

{

	/*

	/*

	 *	Refresh the timer.

	 *	Refresh the timer.
@@ -127,13 +127,12 @@ watchdog_write(struct file *file, const char *data, size_t len, loff_t *ppos) 
	return len;

	return len;

}

}





static struct watchdog_info ident = {

static const struct watchdog_info ident = {

	.options	= WDIOF_SETTIMEOUT,

	.options	= WDIOF_SETTIMEOUT,

	.identity	= "Footbridge Watchdog",

	.identity	= "Footbridge Watchdog",

};

};





static int

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

watchdog_ioctl(struct inode *inode, struct file *file, unsigned int cmd,

							unsigned long arg)

							unsigned long arg)

{

{

	unsigned int new_margin;

	unsigned int new_margin;
@@ -182,7 +181,7 @@ static const struct file_operations watchdog_fops = { 
	.owner		= THIS_MODULE,

	.owner		= THIS_MODULE,

	.llseek		= no_llseek,

	.llseek		= no_llseek,

	.write		= watchdog_write,

	.write		= watchdog_write,

	.ioctl		= watchdog_ioctl,

	.unlocked_ioctl	= watchdog_ioctl,

	.open		= watchdog_open,

	.open		= watchdog_open,

	.release	= watchdog_release,

	.release	= watchdog_release,

};

};
@@ -204,11 +203,13 @@ static int __init footbridge_watchdog_init(void) 
	if (retval < 0)

	if (retval < 0)

		return retval;

		return retval;





	printk("Footbridge Watchdog Timer: 0.01, timer margin: %d sec\n",

	printk(KERN_INFO

		"Footbridge Watchdog Timer: 0.01, timer margin: %d sec\n",

								soft_margin);

								soft_margin);





	if (machine_is_cats())

	if (machine_is_cats())

		printk("Warning: Watchdog reset may not work on this machine.\n");

		printk(KERN_WARN

		  "Warning: Watchdog reset may not work on this machine.\n");

	return 0;

	return 0;

}

}