10 files changed, 16 insertions, 55 deletions

diff --git a/kernel/configs.c b/kernel/configs.c
index d3a4b82a8a96..4c345210ed8c 100644
--- a/kernel/configs.c
+++ b/kernel/configs.c
@@ -79,11 +79,11 @@ static int __init ikconfig_init(void)
         struct proc_dir_entry *entry;
 
         /* create the current config file */
-        entry = create_proc_entry("config.gz", S_IFREG | S_IRUGO, NULL);
+        entry = proc_create("config.gz", S_IFREG | S_IRUGO, NULL,
+                            &ikconfig_file_ops);
         if (!entry)
                 return -ENOMEM;
 
-        entry->proc_fops = &ikconfig_file_ops;
         entry->size = kernel_config_data_size;
 
         return 0;
diff --git a/kernel/dma.c b/kernel/dma.c
index 6a82bb716dac..d2c60a822790 100644
--- a/kernel/dma.c
+++ b/kernel/dma.c
@@ -149,12 +149,7 @@ static const struct file_operations proc_dma_operations = {
 
 static int __init proc_dma_init(void)
 {
-        struct proc_dir_entry *e;
-
-        e = create_proc_entry("dma", 0, NULL);
-        if (e)
-                e->proc_fops = &proc_dma_operations;
-
+        proc_create("dma", 0, NULL, &proc_dma_operations);
         return 0;
 }
 
diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
index f091d13def00..6fc0040f3e3a 100644
--- a/kernel/kallsyms.c
+++ b/kernel/kallsyms.c
@@ -472,11 +472,7 @@ static const struct file_operations kallsyms_operations = {
 
 static int __init kallsyms_init(void)
 {
-        struct proc_dir_entry *entry;
-
-        entry = create_proc_entry("kallsyms", 0444, NULL);
-        if (entry)
-                entry->proc_fops = &kallsyms_operations;
+        proc_create("kallsyms", 0444, NULL, &kallsyms_operations);
         return 0;
 }
 __initcall(kallsyms_init);
diff --git a/kernel/latencytop.c b/kernel/latencytop.c
index 7c74dab0d21b..5e7b45c56923 100644
--- a/kernel/latencytop.c
+++ b/kernel/latencytop.c
@@ -233,14 +233,7 @@ static struct file_operations lstats_fops = {
 
 static int __init init_lstats_procfs(void)
 {
-        struct proc_dir_entry *pe;
-
-        pe = create_proc_entry("latency_stats", 0644, NULL);
-        if (!pe)
-                return -ENOMEM;
-
-        pe->proc_fops = &lstats_fops;
-
+        proc_create("latency_stats", 0644, NULL, &lstats_fops);
         return 0;
 }
 __initcall(init_lstats_procfs);
diff --git a/kernel/lockdep_proc.c b/kernel/lockdep_proc.c
index 8a135bd163c2..dc5d29648d85 100644
--- a/kernel/lockdep_proc.c
+++ b/kernel/lockdep_proc.c
@@ -660,20 +660,12 @@ static const struct file_operations proc_lock_stat_operations = {
 
 static int __init lockdep_proc_init(void)
 {
-        struct proc_dir_entry *entry;
-
-        entry = create_proc_entry("lockdep", S_IRUSR, NULL);
-        if (entry)
-                entry->proc_fops = &proc_lockdep_operations;
-
-        entry = create_proc_entry("lockdep_stats", S_IRUSR, NULL);
-        if (entry)
-                entry->proc_fops = &proc_lockdep_stats_operations;
+        proc_create("lockdep", S_IRUSR, NULL, &proc_lockdep_operations);
+        proc_create("lockdep_stats", S_IRUSR, NULL,
+                    &proc_lockdep_stats_operations);
 
 #ifdef CONFIG_LOCK_STAT
-        entry = create_proc_entry("lock_stat", S_IRUSR, NULL);
-        if (entry)
-                entry->proc_fops = &proc_lock_stat_operations;
+        proc_create("lock_stat", S_IRUSR, NULL, &proc_lock_stat_operations);
 #endif
 
         return 0;
diff --git a/kernel/profile.c b/kernel/profile.c
index 606d7387265c..ae7ead82cbc9 100644
--- a/kernel/profile.c
+++ b/kernel/profile.c
@@ -587,10 +587,10 @@ static int __init create_proc_profile(void)
                 return 0;
         if (create_hash_tables())
                 return -1;
-        entry = create_proc_entry("profile", S_IWUSR | S_IRUGO, NULL);
+        entry = proc_create("profile", S_IWUSR | S_IRUGO,
+                            NULL, &proc_profile_operations);
         if (!entry)
                 return 0;
-        entry->proc_fops = &proc_profile_operations;
         entry->size = (1+prof_len) * sizeof(atomic_t);
         hotcpu_notifier(profile_cpu_callback, 0);
         return 0;
diff --git a/kernel/resource.c b/kernel/resource.c
index cee12cc47cab..74af2d7cb5a1 100644
--- a/kernel/resource.c
+++ b/kernel/resource.c
@@ -131,14 +131,8 @@ static const struct file_operations proc_iomem_operations = {
 
 static int __init ioresources_init(void)
 {
-        struct proc_dir_entry *entry;
-
-        entry = create_proc_entry("ioports", 0, NULL);
-        if (entry)
-                entry->proc_fops = &proc_ioports_operations;
-        entry = create_proc_entry("iomem", 0, NULL);
-        if (entry)
-                entry->proc_fops = &proc_iomem_operations;
+        proc_create("ioports", 0, NULL, &proc_ioports_operations);
+        proc_create("iomem", 0, NULL, &proc_iomem_operations);
         return 0;
 }
 __initcall(ioresources_init);
diff --git a/kernel/sched_debug.c b/kernel/sched_debug.c
index f3f4af4b8b0f..8a9498e7c831 100644
--- a/kernel/sched_debug.c
+++ b/kernel/sched_debug.c
@@ -277,12 +277,9 @@ static int __init init_sched_debug_procfs(void)
 {
         struct proc_dir_entry *pe;
 
-        pe = create_proc_entry("sched_debug", 0644, NULL);
+        pe = proc_create("sched_debug", 0644, NULL, &sched_debug_fops);
         if (!pe)
                 return -ENOMEM;
-
-        pe->proc_fops = &sched_debug_fops;
-
         return 0;
 }
 
diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c
index 67fe8fc21fb1..a40e20fd0001 100644
--- a/kernel/time/timer_list.c
+++ b/kernel/time/timer_list.c
@@ -278,12 +278,9 @@ static int __init init_timer_list_procfs(void)
 {
         struct proc_dir_entry *pe;
 
-        pe = create_proc_entry("timer_list", 0644, NULL);
+        pe = proc_create("timer_list", 0644, NULL, &timer_list_fops);
         if (!pe)
                 return -ENOMEM;
-
-        pe->proc_fops = &timer_list_fops;
-
         return 0;
 }
 __initcall(init_timer_list_procfs);
diff --git a/kernel/time/timer_stats.c b/kernel/time/timer_stats.c
index 417da8c5bc72..c994530d166d 100644
--- a/kernel/time/timer_stats.c
+++ b/kernel/time/timer_stats.c
@@ -415,12 +415,9 @@ static int __init init_tstats_procfs(void)
 {
         struct proc_dir_entry *pe;
 
-        pe = create_proc_entry("timer_stats", 0644, NULL);
+        pe = proc_create("timer_stats", 0644, NULL, &tstats_fops);
         if (!pe)
                 return -ENOMEM;
-
-        pe->proc_fops = &tstats_fops;
-
         return 0;
 }
 __initcall(init_tstats_procfs);