[WATCHDOG] More coding-style and trivial clean-up

[mirror_ubuntu-bionic-kernel.git] / drivers / watchdog / riowd.c

diff --git a/drivers/watchdog/riowd.c b/drivers/watchdog/riowd.c
index 04fd1bac2db5f3aff4f092e10aefd6a9aad617d8..2cff53310f7b87f444dbc2086507432013b05198 100644 (file)
--- a/drivers/watchdog/riowd.c
+++ b/drivers/watchdog/riowd.c
@@ -86,8 +86,7 @@ static int riowd_release(struct inode *inode, struct file *filp)
        return 0;
 }
 
-static int riowd_ioctl(struct inode *inode, struct file *filp,
-                      unsigned int cmd, unsigned long arg)
+static long riowd_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 {
        static struct watchdog_info info = {
                .options                = WDIOF_SETTIMEOUT,
@@ -147,7 +146,8 @@ static int riowd_ioctl(struct inode *inode, struct file *filp,
        return 0;
 }
 
-static ssize_t riowd_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos)
+static ssize_t riowd_write(struct file *file, const char __user *buf,
+                                               size_t count, loff_t *ppos)
 {
        struct riowd *p = riowd_device;
 
@@ -160,12 +160,12 @@ static ssize_t riowd_write(struct file *file, const char __user *buf, size_t cou
 }
 
 static const struct file_operations riowd_fops = {
-       .owner =        THIS_MODULE,
-       .llseek =       no_llseek,
-       .ioctl =        riowd_ioctl,
-       .open =         riowd_open,
-       .write =        riowd_write,
-       .release =      riowd_release,
+       .owner =                THIS_MODULE,
+       .llseek =               no_llseek,
+       .unlocked_ioctl =       riowd_ioctl,
+       .open =                 riowd_open,
+       .write =                riowd_write,
+       .release =              riowd_release,
 };
 
 static struct miscdevice riowd_miscdev = {
@@ -230,7 +230,7 @@ static int __devexit riowd_remove(struct of_device *op)
        return 0;
 }
 
-static struct of_device_id riowd_match[] = {
+static const struct of_device_id riowd_match[] = {
        {
                .name = "pmc",
        },