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

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

[WATCHDOG 40/57] sbc_epx_c3_wdt: switch to 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 9f53c8de

drivers/watchdog/sbc_epx_c3.c

+6 −6
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ 
#include <linux/reboot.h>

#include <linux/init.h>

#include <linux/ioport.h>

#include <asm/uaccess.h>

#include <asm/io.h>

#include <linux/uaccess.h>

#include <linux/io.h>



#define PFX "epx_c3: "

static int epx_c3_alive;
@@ -100,12 +100,12 @@ static ssize_t epx_c3_write(struct file *file, const char __user *data, 
	return len;

}



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

			unsigned int cmd, unsigned long arg)

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

						unsigned long arg)

{

	int options, retval = -EINVAL;

	int __user *argp = (void __user *)arg;

	static struct watchdog_info ident = {

	static const struct watchdog_info ident = {

		.options		= WDIOF_KEEPALIVEPING |

					  WDIOF_MAGICCLOSE,

		.firmware_version	= 0,
@@ -158,7 +158,7 @@ static const struct file_operations epx_c3_fops = { 
	.owner		= THIS_MODULE,

	.llseek		= no_llseek,

	.write		= epx_c3_write,

	.ioctl		= epx_c3_ioctl,

	.unlocked_ioctl	= epx_c3_ioctl,

	.open		= epx_c3_open,

	.release	= epx_c3_release,

};