staging/comedi/me4000: fix sparse warning "obsolete struct initializer"

[~andy/linux] / drivers / zorro / proc.c

diff --git a/drivers/zorro/proc.c b/drivers/zorro/proc.c
index 3c7046d796548e443c120ce491d11d4d834894ec..e0c84725d3e94e05a33482349dc90f45f59099a9 100644 (file)
--- a/drivers/zorro/proc.c
+++ b/drivers/zorro/proc.c
@@ -13,7 +13,6 @@
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <linux/init.h>
-#include <linux/smp_lock.h>
 #include <asm/uaccess.h>
 #include <asm/amigahw.h>
 #include <asm/setup.h>
@@ -22,8 +21,9 @@ static loff_t
 proc_bus_zorro_lseek(struct file *file, loff_t off, int whence)
 {
        loff_t new = -1;
+       struct inode *inode = file->f_path.dentry->d_inode;
 
-       lock_kernel();
+       mutex_lock(&inode->i_mutex);
        switch (whence) {
        case 0:
                new = off;
@@ -35,12 +35,12 @@ proc_bus_zorro_lseek(struct file *file, loff_t off, int whence)
                new = sizeof(struct ConfigDev) + off;
                break;
        }
-       if (new < 0 || new > sizeof(struct ConfigDev)) {
-               unlock_kernel();
-               return -EINVAL;
-       }
-       unlock_kernel();
-       return (file->f_pos = new);
+       if (new < 0 || new > sizeof(struct ConfigDev))
+               new = -EINVAL;
+       else
+               file->f_pos = new;
+       mutex_unlock(&inode->i_mutex);
+       return new;
 }
 
 static ssize_t
@@ -67,7 +67,7 @@ proc_bus_zorro_read(struct file *file, char __user *buf, size_t nbytes, loff_t *
        cd.cd_BoardAddr = (void *)zorro_resource_start(z);
        cd.cd_BoardSize = zorro_resource_len(z);
 
-       if (copy_to_user(buf, &cd, nbytes))
+       if (copy_to_user(buf, (void *)&cd + pos, nbytes))
                return -EFAULT;
        *ppos += nbytes;