lkml.org 
[lkml]   [2008]   [May]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 08/57] davinci_wdt: unlocked_ioctl and check locking
    Date
    From: Alan Cox <alan@redhat.com>


    ---

    drivers/watchdog/davinci_wdt.c | 11 +++++------
    1 files changed, 5 insertions(+), 6 deletions(-)


    diff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c
    index 1782c79..926b59c 100644
    --- a/drivers/watchdog/davinci_wdt.c
    +++ b/drivers/watchdog/davinci_wdt.c
    @@ -22,10 +22,10 @@
    #include <linux/bitops.h>
    #include <linux/platform_device.h>
    #include <linux/spinlock.h>
    +#include <linux/uaccess.h>
    +#include <linux/io.h>

    #include <asm/hardware.h>
    -#include <asm/uaccess.h>
    -#include <asm/io.h>

    #define MODULE_NAME "DAVINCI-WDT: "

    @@ -143,9 +143,8 @@ static struct watchdog_info ident = {
    .identity = "DaVinci Watchdog",
    };

    -static int
    -davinci_wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
    - unsigned long arg)
    +static long davinci_wdt_ioctl(struct file *file,
    + unsigned int cmd, unsigned long arg)
    {
    int ret = -ENOTTY;

    @@ -184,7 +183,7 @@ static const struct file_operations davinci_wdt_fops = {
    .owner = THIS_MODULE,
    .llseek = no_llseek,
    .write = davinci_wdt_write,
    - .ioctl = davinci_wdt_ioctl,
    + .unlocked_ioctl = davinci_wdt_ioctl,
    .open = davinci_wdt_open,
    .release = davinci_wdt_release,
    };


    \
     
     \ /
      Last update: 2008-05-19 15:23    [W:0.021 / U:33.280 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site