Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / zorro / proc.c

diff --git a/drivers/zorro/proc.c b/drivers/zorro/proc.c
index 73b3383..1c15ee7 100644 (file)
--- a/drivers/zorro/proc.c
+++ b/drivers/zorro/proc.c
@@ -47,9 +47,7 @@ proc_bus_zorro_lseek(struct file *file, loff_t off, int whence)
 static ssize_t
 proc_bus_zorro_read(struct file *file, char __user *buf, size_t nbytes, loff_t *ppos)
 {
-       struct inode *ino = file_inode(file);
-       struct proc_dir_entry *dp = PDE(ino);
-       struct zorro_dev *z = dp->data;
+       struct zorro_dev *z = PDE_DATA(file_inode(file));
        struct ConfigDev cd;
        loff_t pos = *ppos;
 
@@ -141,7 +139,7 @@ static int __init zorro_proc_attach_device(unsigned int slot)
                                 &zorro_autocon[slot]);
        if (!entry)
                return -ENOMEM;
-       entry->size = sizeof(struct zorro_dev);
+       proc_set_size(entry, sizeof(struct zorro_dev));
        return 0;
 }