Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit a6be8e5ff95e12190fd5e5158eb553255677292f

Authored by Alan Cox
Committed by Wim Van Sebroeck
1 parent fbd4714907
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[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>

Showing 1 changed file with 3 additions and 4 deletions Side-by-side Diff

drivers/watchdog/at32ap700x_wdt.c
Diff comments   View file @ a6be8e5
... ... @@ -212,8 +212,8 @@
212 212 /*
213 213 * Handle commands from user-space.
214 214 */
215   -static int at32_wdt_ioctl(struct inode *inode, struct file *file,
216   - unsigned int cmd, unsigned long arg)
  215 +static long at32_wdt_ioctl(struct file *file,
  216 + unsigned int cmd, unsigned long arg)
217 217 {
218 218 int ret = -ENOTTY;
219 219 int time;
... ... @@ -298,7 +298,7 @@
298 298 static const struct file_operations at32_wdt_fops = {
299 299 .owner = THIS_MODULE,
300 300 .llseek = no_llseek,
301   - .ioctl = at32_wdt_ioctl,
  301 + .unlocked_ioctl = at32_wdt_ioctl,
302 302 .open = at32_wdt_open,
303 303 .release = at32_wdt_close,
304 304 .write = at32_wdt_write,
... ... @@ -391,7 +391,6 @@
391 391 wdt = NULL;
392 392 platform_set_drvdata(pdev, NULL);
393 393 }
394   -
395 394 return 0;
396 395 }
397 396