Merge branch 'next-smack' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

[linux-2.6-block.git] / drivers / isdn / capi / capi.c

diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
index 19cd93783c87d1269f2de40147784f8abbf88f85..baa1ee2bc2ac026ab6d6f950ef5e4c77e1475a24 100644 (file)
--- a/drivers/isdn/capi/capi.c
+++ b/drivers/isdn/capi/capi.c
@@ -1340,19 +1340,6 @@ static int capi20_proc_show(struct seq_file *m, void *v)
        return 0;
 }
 
-static int capi20_proc_open(struct inode *inode, struct file *file)
-{
-       return single_open(file, capi20_proc_show, NULL);
-}
-
-static const struct file_operations capi20_proc_fops = {
-       .owner          = THIS_MODULE,
-       .open           = capi20_proc_open,
-       .read           = seq_read,
-       .llseek         = seq_lseek,
-       .release        = single_release,
-};
-
 /*
  * /proc/capi/capi20ncci:
  *  applid ncci
@@ -1373,23 +1360,10 @@ static int capi20ncci_proc_show(struct seq_file *m, void *v)
        return 0;
 }
 
-static int capi20ncci_proc_open(struct inode *inode, struct file *file)
-{
-       return single_open(file, capi20ncci_proc_show, NULL);
-}
-
-static const struct file_operations capi20ncci_proc_fops = {
-       .owner          = THIS_MODULE,
-       .open           = capi20ncci_proc_open,
-       .read           = seq_read,
-       .llseek         = seq_lseek,
-       .release        = single_release,
-};
-
 static void __init proc_init(void)
 {
-       proc_create("capi/capi20", 0, NULL, &capi20_proc_fops);
-       proc_create("capi/capi20ncci", 0, NULL, &capi20ncci_proc_fops);
+       proc_create_single("capi/capi20", 0, NULL, capi20_proc_show);
+       proc_create_single("capi/capi20ncci", 0, NULL, capi20ncci_proc_show);
 }
 
 static void __exit proc_exit(void)