[WATCHDOG 38/57] stg7240_wdt: unlocked_ioctl (619a8a2b) · Commits · 戴 / test

drivers/watchdog/sbc7240_wdt.c

+7 −9

Original line number	Diff line number	Diff line
		@@ -27,10 +27,10 @@
		#include <linux/reboot.h>
		#include <linux/types.h>
		#include <linux/watchdog.h>
		#include <linux/io.h>
		#include <linux/uaccess.h>
		#include <asm/atomic.h>
		#include <asm/io.h>
		#include <asm/system.h>
		#include <asm/uaccess.h>

		#define SBC7240_PREFIX "sbc7240_wdt: "

		@@ -159,7 +159,7 @@ static int fop_close(struct inode inode, struct file file)
		return 0;
		}

		static struct watchdog_info ident = {
		static const struct watchdog_info ident = {
		.options = WDIOF_KEEPALIVEPING\|
		WDIOF_SETTIMEOUT\|
		WDIOF_MAGICCLOSE,
		@@ -168,13 +168,11 @@ static struct watchdog_info ident = {
		};


		static int fop_ioctl(struct inode inode, struct file file, unsigned int cmd,
		unsigned long arg)
		static long fop_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
		{
		switch (cmd) {
		case WDIOC_GETSUPPORT:
		return copy_to_user
		((void __user *)arg, &ident, sizeof(ident))
		return copy_to_user((void __user *)arg, &ident, sizeof(ident))
		? -EFAULT : 0;
		case WDIOC_GETSTATUS:
		case WDIOC_GETBOOTSTATUS:
		@@ -225,7 +223,7 @@ static const struct file_operations wdt_fops = {
		.write = fop_write,
		.open = fop_open,
		.release = fop_close,
		.ioctl = fop_ioctl,
		.unlocked_ioctl = fop_ioctl,
		};

		static struct miscdevice wdt_miscdev = {