Skip to content

Commit

Permalink
[POWERPC] Assign PDE->data before gluing PDE into /proc tree
Browse files Browse the repository at this point in the history
Simply replace proc_create and further data assigned with proc_create_data.
No need to check for data!=NULL after that.

Signed-off-by: Denis 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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
  • Loading branch information
Denis V. Lunev authored and Paul Mackerras committed May 5, 2008
1 parent b41e5ff commit 9185ef6
Showing 1 changed file with 2 additions and 17 deletions.
19 changes: 2 additions & 17 deletions arch/powerpc/platforms/pseries/scanlog.c
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,6 @@ static ssize_t scanlog_read(struct file *file, char __user *buf,
dp = PDE(inode);
data = (unsigned int *)dp->data;

if (!data) {
printk(KERN_ERR "scanlog: read failed no data\n");
return -EIO;
}

if (count > RTAS_DATA_BUF_SIZE)
count = RTAS_DATA_BUF_SIZE;

Expand Down Expand Up @@ -146,11 +141,6 @@ static int scanlog_open(struct inode * inode, struct file * file)
struct proc_dir_entry *dp = PDE(inode);
unsigned int *data = (unsigned int *)dp->data;

if (!data) {
printk(KERN_ERR "scanlog: open failed no data\n");
return -EIO;
}

if (data[0] != 0) {
/* This imperfect test stops a second copy of the
* data (or a reset while data is being copied)
Expand All @@ -168,10 +158,6 @@ static int scanlog_release(struct inode * inode, struct file * file)
struct proc_dir_entry *dp = PDE(inode);
unsigned int *data = (unsigned int *)dp->data;

if (!data) {
printk(KERN_ERR "scanlog: release failed no data\n");
return -EIO;
}
data[0] = 0;

return 0;
Expand Down Expand Up @@ -200,12 +186,11 @@ static int __init scanlog_init(void)
if (!data)
goto err;

ent = proc_create("ppc64/rtas/scan-log-dump", S_IRUSR, NULL,
&scanlog_fops);
ent = proc_create_data("ppc64/rtas/scan-log-dump", S_IRUSR, NULL,
&scanlog_fops, data);
if (!ent)
goto err;

ent->data = data;
proc_ppc64_scan_log_dump = ent;

return 0;
Expand Down

0 comments on commit 9185ef6

Please sign in to comment.