system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-09-23 04:49:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

[WATCHDOG 36/57] sa1100_wdt: Switch to unlocked_ioctl

Browse source 
Review and switch to unlocked_ioctl

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
This commit is contained in:
Alan Cox 2008-05-19 14:08:05 +01:00 committed by Wim Van Sebroeck
parent edef7a93f9
commit f19e031265
1 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
drivers/watchdog/sa1100_wdt.c
View file

@ -26,13 +26,13 @@
#include <linux/watchdog.h> #include <linux/watchdog.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/uaccess.h>
#ifdef CONFIG_ARCH_PXA #ifdef CONFIG_ARCH_PXA
#include <asm/arch/pxa-regs.h> #include <asm/arch/pxa-regs.h>
#endif #endif
#include <asm/hardware.h> #include <asm/hardware.h>
#include <asm/uaccess.h>
#define OSCR_FREQ CLOCK_TICK_RATE #define OSCR_FREQ CLOCK_TICK_RATE
@ -45,7 +45,7 @@ static int boot_status;
*/ */
static int sa1100dog_open(struct inode *inode, struct file *file) static int sa1100dog_open(struct inode *inode, struct file *file)
{ {
if (test_and_set_bit(1,&sa1100wdt_users)) if (test_and_set_bit(1, &sa1100wdt_users))
return -EBUSY; return -EBUSY;
/* Activate SA1100 Watchdog timer */ /* Activate SA1100 Watchdog timer */
@ -66,28 +66,27 @@ static int sa1100dog_open(struct inode *inode, struct file *file)
static int sa1100dog_release(struct inode *inode, struct file *file) static int sa1100dog_release(struct inode *inode, struct file *file)
{ {
printk(KERN_CRIT "WATCHDOG: Device closed - timer will not stop\n"); printk(KERN_CRIT "WATCHDOG: Device closed - timer will not stop\n");
clear_bit(1, &sa1100wdt_users); clear_bit(1, &sa1100wdt_users);
return 0; return 0;
} }
static ssize_t sa1100dog_write(struct file *file, const char __user *data, size_t len, loff_t *ppos) static ssize_t sa1100dog_write(struct file *file, const char __user *data,
size_t len, loff_t *ppos)
{ {
if (len) if (len)
/* Refresh OSMR3 timer. */ /* Refresh OSMR3 timer. */
OSMR3 = OSCR + pre_margin; OSMR3 = OSCR + pre_margin;
return len; return len;
} }
static struct watchdog_info ident = { static const struct watchdog_info ident = {
.options = WDIOF_CARDRESET | WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING, .options = WDIOF_CARDRESET | WDIOF_SETTIMEOUT
| WDIOF_KEEPALIVEPING,
.identity = "SA1100/PXA255 Watchdog", .identity = "SA1100/PXA255 Watchdog",
}; };
static int sa1100dog_ioctl(struct inode *inode, struct file *file, static long sa1100dog_ioctl(struct file *file, unsigned int cmd,
unsigned int cmd, unsigned long arg) unsigned long arg)
{ {
int ret = -ENOTTY; int ret = -ENOTTY;
int time; int time;
@ -134,18 +133,16 @@ static int sa1100dog_ioctl(struct inode *inode, struct file *file,
return ret; return ret;
} }
static const struct file_operations sa1100dog_fops = static const struct file_operations sa1100dog_fops = {
{
.owner = THIS_MODULE, .owner = THIS_MODULE,
.llseek = no_llseek, .llseek = no_llseek,
.write = sa1100dog_write, .write = sa1100dog_write,
.ioctl = sa1100dog_ioctl, .unlocked_ioctl = sa1100dog_ioctl,
.open = sa1100dog_open, .open = sa1100dog_open,
.release = sa1100dog_release, .release = sa1100dog_release,
}; };
static struct miscdevice sa1100dog_miscdev = static struct miscdevice sa1100dog_miscdev = {
{
.minor = WATCHDOG_MINOR, .minor = WATCHDOG_MINOR,
.name = "watchdog", .name = "watchdog",
.fops = &sa1100dog_fops, .fops = &sa1100dog_fops,
@ -167,8 +164,9 @@ static int __init sa1100dog_init(void)
ret = misc_register(&sa1100dog_miscdev); ret = misc_register(&sa1100dog_miscdev);
if (ret == 0) if (ret == 0)
printk("SA1100/PXA2xx Watchdog Timer: timer margin %d sec\n", printk(KERN_INFO
margin); "SA1100/PXA2xx Watchdog Timer: timer margin %d sec\n",
margin);
return ret; return ret;
} }