Skip to content

Commit

Permalink
[IRDA]: Use proc_create() to setup ->proc_fops first
Browse files Browse the repository at this point in the history
Use proc_create() to make sure that ->proc_fops be setup before gluing
PDE to main tree.

Signed-off-by: Wang Chen <wangchen@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Wang Chen authored and David S. Miller committed Feb 29, 2008
1 parent 0bc8c7b commit 5e47879
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 11 deletions.
8 changes: 5 additions & 3 deletions net/irda/ircomm/ircomm_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,11 @@ static int __init ircomm_init(void)

#ifdef CONFIG_PROC_FS
{ struct proc_dir_entry *ent;
ent = create_proc_entry("ircomm", 0, proc_irda);
if (ent)
ent->proc_fops = &ircomm_proc_fops;
ent = proc_create("ircomm", 0, proc_irda, &ircomm_proc_fops);
if (!ent) {
printk(KERN_ERR "ircomm_init: can't create /proc entry!\n");
return -ENODEV;
}
}
#endif /* CONFIG_PROC_FS */

Expand Down
4 changes: 1 addition & 3 deletions net/irda/irlan/irlan_common.c
Original file line number Diff line number Diff line change
Expand Up @@ -128,13 +128,11 @@ static int __init irlan_init(void)

#ifdef CONFIG_PROC_FS
{ struct proc_dir_entry *proc;
proc = create_proc_entry("irlan", 0, proc_irda);
proc = proc_create("irlan", 0, proc_irda, &irlan_fops);
if (!proc) {
printk(KERN_ERR "irlan_init: can't create /proc entry!\n");
return -ENODEV;
}

proc->proc_fops = &irlan_fops;
}
#endif /* CONFIG_PROC_FS */

Expand Down
8 changes: 3 additions & 5 deletions net/irda/irproc.c
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,9 @@ void __init irda_proc_register(void)
return;
proc_irda->owner = THIS_MODULE;

for (i=0; i<ARRAY_SIZE(irda_dirs); i++) {
d = create_proc_entry(irda_dirs[i].name, 0, proc_irda);
if (d)
d->proc_fops = irda_dirs[i].fops;
}
for (i = 0; i < ARRAY_SIZE(irda_dirs); i++)
d = proc_create(irda_dirs[i].name, 0, proc_irda,
irda_dirs[i].fops);
}

/*
Expand Down

0 comments on commit 5e47879

Please sign in to comment.