diff options
Diffstat (limited to 'drivers/pnp/isapnp/proc.c')
-rw-r--r-- | drivers/pnp/isapnp/proc.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/pnp/isapnp/proc.c b/drivers/pnp/isapnp/proc.c index 40b724ebe23b..fba4b072e6bd 100644 --- a/drivers/pnp/isapnp/proc.c +++ b/drivers/pnp/isapnp/proc.c | |||
@@ -54,7 +54,8 @@ static loff_t isapnp_proc_bus_lseek(struct file *file, loff_t off, int whence) | |||
54 | return (file->f_pos = new); | 54 | return (file->f_pos = new); |
55 | } | 55 | } |
56 | 56 | ||
57 | static ssize_t isapnp_proc_bus_read(struct file *file, char __user *buf, size_t nbytes, loff_t *ppos) | 57 | static ssize_t isapnp_proc_bus_read(struct file *file, char __user * buf, |
58 | size_t nbytes, loff_t * ppos) | ||
58 | { | 59 | { |
59 | struct inode *ino = file->f_path.dentry->d_inode; | 60 | struct inode *ino = file->f_path.dentry->d_inode; |
60 | struct proc_dir_entry *dp = PDE(ino); | 61 | struct proc_dir_entry *dp = PDE(ino); |
@@ -74,7 +75,7 @@ static ssize_t isapnp_proc_bus_read(struct file *file, char __user *buf, size_t | |||
74 | return -EINVAL; | 75 | return -EINVAL; |
75 | 76 | ||
76 | isapnp_cfg_begin(dev->card->number, dev->number); | 77 | isapnp_cfg_begin(dev->card->number, dev->number); |
77 | for ( ; pos < 256 && cnt > 0; pos++, buf++, cnt--) { | 78 | for (; pos < 256 && cnt > 0; pos++, buf++, cnt--) { |
78 | unsigned char val; | 79 | unsigned char val; |
79 | val = isapnp_read_byte(pos); | 80 | val = isapnp_read_byte(pos); |
80 | __put_user(val, buf); | 81 | __put_user(val, buf); |
@@ -85,10 +86,9 @@ static ssize_t isapnp_proc_bus_read(struct file *file, char __user *buf, size_t | |||
85 | return nbytes; | 86 | return nbytes; |
86 | } | 87 | } |
87 | 88 | ||
88 | static const struct file_operations isapnp_proc_bus_file_operations = | 89 | static const struct file_operations isapnp_proc_bus_file_operations = { |
89 | { | 90 | .llseek = isapnp_proc_bus_lseek, |
90 | .llseek = isapnp_proc_bus_lseek, | 91 | .read = isapnp_proc_bus_read, |
91 | .read = isapnp_proc_bus_read, | ||
92 | }; | 92 | }; |
93 | 93 | ||
94 | static int isapnp_proc_attach_device(struct pnp_dev *dev) | 94 | static int isapnp_proc_attach_device(struct pnp_dev *dev) |
@@ -145,7 +145,7 @@ int __init isapnp_proc_init(void) | |||
145 | { | 145 | { |
146 | struct pnp_dev *dev; | 146 | struct pnp_dev *dev; |
147 | isapnp_proc_bus_dir = proc_mkdir("isapnp", proc_bus); | 147 | isapnp_proc_bus_dir = proc_mkdir("isapnp", proc_bus); |
148 | protocol_for_each_dev(&isapnp_protocol,dev) { | 148 | protocol_for_each_dev(&isapnp_protocol, dev) { |
149 | isapnp_proc_attach_device(dev); | 149 | isapnp_proc_attach_device(dev); |
150 | } | 150 | } |
151 | return 0; | 151 | return 0; |