diff options
| author | Alan Cox <alan@redhat.com> | 2008-05-19 15:05:13 +0200 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2008-05-27 17:26:40 +0200 |
| commit | a6be8e5ff95e12190fd5e5158eb553255677292f (patch) | |
| tree | 31c55d7713b50aa24c4fa72a575046b422964eb1 /drivers/watchdog | |
| parent | [WATCHDOG 04/57] AR7 watchdog (diff) | |
| download | linux-a6be8e5ff95e12190fd5e5158eb553255677292f.tar.xz linux-a6be8e5ff95e12190fd5e5158eb553255677292f.zip | |
[WATCHDOG 05/57] atp watchdog
Switch to unlocked_ioctl
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog')
| -rw-r--r-- | drivers/watchdog/at32ap700x_wdt.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/watchdog/at32ap700x_wdt.c b/drivers/watchdog/at32ap700x_wdt.c index ae0fca5e8749..c5dc5e912fb2 100644 --- a/drivers/watchdog/at32ap700x_wdt.c +++ b/drivers/watchdog/at32ap700x_wdt.c @@ -212,8 +212,8 @@ static struct watchdog_info at32_wdt_info = { /* * Handle commands from user-space. */ -static int at32_wdt_ioctl(struct inode *inode, struct file *file, - unsigned int cmd, unsigned long arg) +static long at32_wdt_ioctl(struct file *file, + unsigned int cmd, unsigned long arg) { int ret = -ENOTTY; int time; @@ -298,7 +298,7 @@ static ssize_t at32_wdt_write(struct file *file, const char __user *data, static const struct file_operations at32_wdt_fops = { .owner = THIS_MODULE, .llseek = no_llseek, - .ioctl = at32_wdt_ioctl, + .unlocked_ioctl = at32_wdt_ioctl, .open = at32_wdt_open, .release = at32_wdt_close, .write = at32_wdt_write, @@ -391,7 +391,6 @@ static int __exit at32_wdt_remove(struct platform_device *pdev) wdt = NULL; platform_set_drvdata(pdev, NULL); } - return 0; } |