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

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

[WATCHDOG 09/57] ep93xx_wdt: 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 f78b0a8f

drivers/watchdog/ep93xx_wdt.c

+9 −8
Original line number Diff line number Diff line
@@ -28,9 +28,9 @@ 
#include <linux/miscdevice.h>

#include <linux/watchdog.h>

#include <linux/timer.h>

#include <linux/uaccess.h>



#include <asm/hardware.h>

#include <asm/uaccess.h>



#define WDT_VERSION	"0.3"

#define PFX		"ep93xx_wdt: "
@@ -136,9 +136,8 @@ static struct watchdog_info ident = { 
	.identity = "EP93xx Watchdog",

};



static int

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

		 unsigned long arg)

static long ep93xx_wdt_ioctl(struct file *file,

					unsigned int cmd, unsigned long arg)

{

	int ret = -ENOTTY;
@@ -174,8 +173,8 @@ static int ep93xx_wdt_release(struct inode *inode, struct file *file) 
	if (test_bit(WDT_OK_TO_CLOSE, &wdt_status))

		wdt_shutdown();

	else

		printk(KERN_CRIT PFX "Device closed unexpectedly - "

			"timer will not stop\n");

		printk(KERN_CRIT PFX

			"Device closed unexpectedly - timer will not stop\n");



	clear_bit(WDT_IN_USE, &wdt_status);

	clear_bit(WDT_OK_TO_CLOSE, &wdt_status);
@@ -186,7 +185,7 @@ static int ep93xx_wdt_release(struct inode *inode, struct file *file) 
static const struct file_operations ep93xx_wdt_fops = {

	.owner		= THIS_MODULE,

	.write		= ep93xx_wdt_write,

	.ioctl		= ep93xx_wdt_ioctl,

	.unlocked_ioctl	= ep93xx_wdt_ioctl,

	.open		= ep93xx_wdt_open,

	.release	= ep93xx_wdt_release,

};
@@ -243,7 +242,9 @@ module_param(nowayout, int, 0); 
MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started");



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



MODULE_AUTHOR("Ray Lehtiniemi <rayl@mail.com>,"

		"Alessandro Zummo <a.zummo@towertech.it>");