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 33/57] pnx4008_wdt: unlocked_ioctl setup
    Date
    From: Alan Cox <alan@redhat.com>


    ---

    drivers/watchdog/pnx4008_wdt.c | 18 ++++++++----------
    1 files changed, 8 insertions(+), 10 deletions(-)


    diff --git a/drivers/watchdog/pnx4008_wdt.c b/drivers/watchdog/pnx4008_wdt.c
    index 6b8483d..8cd0d53 100644
    --- a/drivers/watchdog/pnx4008_wdt.c
    +++ b/drivers/watchdog/pnx4008_wdt.c
    @@ -30,8 +30,8 @@
    #include <linux/spinlock.h>

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

    #define MODULE_NAME "PNX4008-WDT: "

    @@ -144,9 +144,8 @@ static int pnx4008_wdt_open(struct inode *inode, struct file *file)
    return nonseekable_open(inode, file);
    }

    -static ssize_t
    -pnx4008_wdt_write(struct file *file, const char *data, size_t len,
    - loff_t * ppos)
    +static ssize_t pnx4008_wdt_write(struct file *file, const char *data,
    + size_t len, loff_t *ppos)
    {
    if (len) {
    if (!nowayout) {
    @@ -169,15 +168,14 @@ pnx4008_wdt_write(struct file *file, const char *data, size_t len,
    return len;
    }

    -static struct watchdog_info ident = {
    +static const struct watchdog_info ident = {
    .options = WDIOF_CARDRESET | WDIOF_MAGICCLOSE |
    WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING,
    .identity = "PNX4008 Watchdog",
    };

    -static int
    -pnx4008_wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
    - unsigned long arg)
    +static long pnx4008_wdt_ioctl(struct inode *inode, struct file *file,
    + unsigned int cmd, unsigned long arg)
    {
    int ret = -ENOTTY;
    int time;
    @@ -238,7 +236,7 @@ static const struct file_operations pnx4008_wdt_fops = {
    .owner = THIS_MODULE,
    .llseek = no_llseek,
    .write = pnx4008_wdt_write,
    - .ioctl = pnx4008_wdt_ioctl,
    + .unlocked_ioctl = pnx4008_wdt_ioctl,
    .open = pnx4008_wdt_open,
    .release = pnx4008_wdt_release,
    };


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