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

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

[WATCHDOG 08/57] davinci_wdt: unlocked_ioctl and check locking 



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 6f932f18

drivers/watchdog/davinci_wdt.c

+5 −6
Original line number Diff line number Diff line
@@ -22,10 +22,10 @@ 
#include <linux/bitops.h>

#include <linux/platform_device.h>

#include <linux/spinlock.h>

#include <linux/uaccess.h>

#include <linux/io.h>



#include <asm/hardware.h>

#include <asm/uaccess.h>

#include <asm/io.h>



#define MODULE_NAME "DAVINCI-WDT: "
@@ -143,9 +143,8 @@ static struct watchdog_info ident = { 
	.identity = "DaVinci Watchdog",

};



static int

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

		  unsigned long arg)

static long davinci_wdt_ioctl(struct file *file,

					unsigned int cmd, unsigned long arg)

{

	int ret = -ENOTTY;
@@ -184,7 +183,7 @@ static const struct file_operations davinci_wdt_fops = { 
	.owner = THIS_MODULE,

	.llseek = no_llseek,

	.write = davinci_wdt_write,

	.ioctl = davinci_wdt_ioctl,

	.unlocked_ioctl = davinci_wdt_ioctl,

	.open = davinci_wdt_open,

	.release = davinci_wdt_release,

};