Commit 9185ef67 authored by Denis V. Lunev's avatar Denis V. Lunev Committed by Paul Mackerras

[POWERPC] Assign PDE->data before gluing PDE into /proc tree

Simply replace proc_create and further data assigned with proc_create_data.
No need to check for data!=NULL after that.
Signed-off-by: default avatarDenis V. Lunev <den@openvz.org>
Cc: Alexey Dobriyan <adobriyan@openvz.org>
Cc: Eric W. Biederman <ebiederm@xmission.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent b41e5fff
...@@ -55,11 +55,6 @@ static ssize_t scanlog_read(struct file *file, char __user *buf, ...@@ -55,11 +55,6 @@ static ssize_t scanlog_read(struct file *file, char __user *buf,
dp = PDE(inode); dp = PDE(inode);
data = (unsigned int *)dp->data; data = (unsigned int *)dp->data;
if (!data) {
printk(KERN_ERR "scanlog: read failed no data\n");
return -EIO;
}
if (count > RTAS_DATA_BUF_SIZE) if (count > RTAS_DATA_BUF_SIZE)
count = RTAS_DATA_BUF_SIZE; count = RTAS_DATA_BUF_SIZE;
...@@ -146,11 +141,6 @@ static int scanlog_open(struct inode * inode, struct file * file) ...@@ -146,11 +141,6 @@ static int scanlog_open(struct inode * inode, struct file * file)
struct proc_dir_entry *dp = PDE(inode); struct proc_dir_entry *dp = PDE(inode);
unsigned int *data = (unsigned int *)dp->data; unsigned int *data = (unsigned int *)dp->data;
if (!data) {
printk(KERN_ERR "scanlog: open failed no data\n");
return -EIO;
}
if (data[0] != 0) { if (data[0] != 0) {
/* This imperfect test stops a second copy of the /* This imperfect test stops a second copy of the
* data (or a reset while data is being copied) * data (or a reset while data is being copied)
...@@ -168,10 +158,6 @@ static int scanlog_release(struct inode * inode, struct file * file) ...@@ -168,10 +158,6 @@ static int scanlog_release(struct inode * inode, struct file * file)
struct proc_dir_entry *dp = PDE(inode); struct proc_dir_entry *dp = PDE(inode);
unsigned int *data = (unsigned int *)dp->data; unsigned int *data = (unsigned int *)dp->data;
if (!data) {
printk(KERN_ERR "scanlog: release failed no data\n");
return -EIO;
}
data[0] = 0; data[0] = 0;
return 0; return 0;
...@@ -200,12 +186,11 @@ static int __init scanlog_init(void) ...@@ -200,12 +186,11 @@ static int __init scanlog_init(void)
if (!data) if (!data)
goto err; goto err;
ent = proc_create("ppc64/rtas/scan-log-dump", S_IRUSR, NULL, ent = proc_create_data("ppc64/rtas/scan-log-dump", S_IRUSR, NULL,
&scanlog_fops); &scanlog_fops, data);
if (!ent) if (!ent)
goto err; goto err;
ent->data = data;
proc_ppc64_scan_log_dump = ent; proc_ppc64_scan_log_dump = ent;
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment