Merge branch 'hch.procfs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull procfs updates from Al Viro:
 "Christoph's proc_create_... cleanups series"

* 'hch.procfs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (44 commits)
  xfs, proc: hide unused xfs procfs helpers
  isdn/gigaset: add back gigaset_procinfo assignment
  proc: update SIZEOF_PDE_INLINE_NAME for the new pde fields
  tty: replace ->proc_fops with ->proc_show
  ide: replace ->proc_fops with ->proc_show
  ide: remove ide_driver_proc_write
  isdn: replace ->proc_fops with ->proc_show
  atm: switch to proc_create_seq_private
  atm: simplify procfs code
  bluetooth: switch to proc_create_seq_data
  netfilter/x_tables: switch to proc_create_seq_private
  netfilter/xt_hashlimit: switch to proc_create_{seq,single}_data
  neigh: switch to proc_create_seq_data
  hostap: switch to proc_create_{seq,single}_data
  bonding: switch to proc_create_seq_data
  rtc/proc: switch to proc_create_single_data
  drbd: switch to proc_create_single
  resource: switch to proc_create_seq_data
  staging/rtl8192u: simplify procfs code
  jfs: simplify procfs code
  ...

266 files changed, 1229 insertions, 6032 deletions

diff --git a/arch/arm/kernel/dma.c b/arch/arm/kernel/dma.c
index e651c4d0a0d9..6739d37c2bc5 100644
--- a/arch/arm/kernel/dma.c
+++ b/arch/arm/kernel/dma.c
@@ -276,21 +276,9 @@ static int proc_dma_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int proc_dma_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, proc_dma_show, NULL);
-}
-
-static const struct file_operations proc_dma_operations = {
-        .open           = proc_dma_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static int __init proc_dma_init(void)
 {
-        proc_create("dma", 0, NULL, &proc_dma_operations);
+        proc_create_single("dma", 0, NULL, proc_dma_show);
         return 0;
 }
 
diff --git a/arch/arm/kernel/swp_emulate.c b/arch/arm/kernel/swp_emulate.c
index 3bda08bee674..6e971e114879 100644
--- a/arch/arm/kernel/swp_emulate.c
+++ b/arch/arm/kernel/swp_emulate.c
@@ -91,18 +91,6 @@ static int proc_status_show(struct seq_file *m, void *v)
                 seq_printf(m, "Last process:\t\t%d\n", previous_pid);
         return 0;
 }
-
-static int proc_status_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, proc_status_show, PDE_DATA(inode));
-}
-
-static const struct file_operations proc_status_fops = {
-        .open           = proc_status_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
 #endif
 
 /*
@@ -260,7 +248,8 @@ static int __init swp_emulation_init(void)
                 return 0;
 
 #ifdef CONFIG_PROC_FS
-        if (!proc_create("cpu/swp_emulation", S_IRUGO, NULL, &proc_status_fops))
+        if (!proc_create_single("cpu/swp_emulation", S_IRUGO, NULL,
+                        proc_status_show))
                 return -ENOMEM;
 #endif /* CONFIG_PROC_FS */
 
diff --git a/arch/arm/mach-rpc/ecard.c b/arch/arm/mach-rpc/ecard.c
index bdb5ec1cf560..39aef4876ed4 100644
--- a/arch/arm/mach-rpc/ecard.c
+++ b/arch/arm/mach-rpc/ecard.c
@@ -657,25 +657,13 @@ static int ecard_devices_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int ecard_devices_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, ecard_devices_proc_show, NULL);
-}
-
-static const struct file_operations bus_ecard_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = ecard_devices_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static struct proc_dir_entry *proc_bus_ecard_dir = NULL;
 
 static void ecard_proc_init(void)
 {
         proc_bus_ecard_dir = proc_mkdir("bus/ecard", NULL);
-        proc_create("devices", 0, proc_bus_ecard_dir, &bus_ecard_proc_fops);
+        proc_create_single("devices", 0, proc_bus_ecard_dir,
+                        ecard_devices_proc_show);
 }
 
 #define ec_set_resource(ec,nr,st,sz)                            \
diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c
index aec4a3354abe..cb5cd86a5530 100644
--- a/arch/ia64/hp/common/sba_iommu.c
+++ b/arch/ia64/hp/common/sba_iommu.c
@@ -1942,19 +1942,6 @@ static const struct seq_operations ioc_seq_ops = {
         .show  = ioc_show
 };
 
-static int
-ioc_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &ioc_seq_ops);
-}
-
-static const struct file_operations ioc_fops = {
-        .open    = ioc_open,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
-        .release = seq_release
-};
-
 static void __init
 ioc_proc_init(void)
 {
@@ -1964,7 +1951,7 @@ ioc_proc_init(void)
         if (!dir)
                 return;
 
-        proc_create(ioc_list->name, 0, dir, &ioc_fops);
+        proc_create_seq(ioc_list->name, 0, dir, &ioc_seq_ops);
 }
 #endif
 
diff --git a/arch/ia64/hp/sim/simserial.c b/arch/ia64/hp/sim/simserial.c
index a419ccf33cde..663388a73d4e 100644
--- a/arch/ia64/hp/sim/simserial.c
+++ b/arch/ia64/hp/sim/simserial.c
@@ -435,19 +435,6 @@ static int rs_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int rs_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, rs_proc_show, NULL);
-}
-
-static const struct file_operations rs_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = rs_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static const struct tty_operations hp_ops = {
         .open = rs_open,
         .close = rs_close,
@@ -462,7 +449,7 @@ static const struct tty_operations hp_ops = {
         .unthrottle = rs_unthrottle,
         .send_xchar = rs_send_xchar,
         .hangup = rs_hangup,
-        .proc_fops = &rs_proc_fops,
+        .proc_show = rs_proc_show,
 };
 
 static const struct tty_port_operations hp_port_ops = {
diff --git a/arch/ia64/kernel/palinfo.c b/arch/ia64/kernel/palinfo.c
index b6e597860888..f4a94241265c 100644
--- a/arch/ia64/kernel/palinfo.c
+++ b/arch/ia64/kernel/palinfo.c
@@ -920,18 +920,6 @@ static int proc_palinfo_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int proc_palinfo_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, proc_palinfo_show, PDE_DATA(inode));
-}
-
-static const struct file_operations proc_palinfo_fops = {
-        .open           = proc_palinfo_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static int palinfo_add_proc(unsigned int cpu)
 {
         pal_func_cpu_u_t f;
@@ -948,8 +936,8 @@ static int palinfo_add_proc(unsigned int cpu)
 
         for (j=0; j < NR_PALINFO_ENTRIES; j++) {
                 f.func_id = j;
-                proc_create_data(palinfo_entries[j].name, 0, cpu_dir,
-                                 &proc_palinfo_fops, (void *)f.value);
+                proc_create_single_data(palinfo_entries[j].name, 0, cpu_dir,
+                                proc_palinfo_show, (void *)f.value);
         }
         return 0;
 }
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c
index 8fb280e33114..3b38c717008a 100644
--- a/arch/ia64/kernel/perfmon.c
+++ b/arch/ia64/kernel/perfmon.c
@@ -5708,13 +5708,6 @@ const struct seq_operations pfm_seq_ops = {
         .show =         pfm_proc_show
 };
 
-static int
-pfm_proc_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &pfm_seq_ops);
-}
-
-
 /*
  * we come here as soon as local_cpu_data->pfm_syst_wide is set. this happens
  * during pfm_enable() hence before pfm_start(). We cannot assume monitoring
@@ -6537,13 +6530,6 @@ found:
         return 0;
 }
 
-static const struct file_operations pfm_proc_fops = {
-        .open           = pfm_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release,
-};
-
 int __init
 pfm_init(void)
 {
@@ -6615,7 +6601,7 @@ pfm_init(void)
         /*
          * create /proc/perfmon (mostly for debugging purposes)
          */
-        perfmon_dir = proc_create("perfmon", S_IRUGO, NULL, &pfm_proc_fops);
+        perfmon_dir = proc_create_seq("perfmon", S_IRUGO, NULL, &pfm_seq_ops);
         if (perfmon_dir == NULL) {
                 printk(KERN_ERR "perfmon: cannot create /proc entry, perfmon disabled\n");
                 pmu_conf = NULL;
diff --git a/arch/ia64/kernel/salinfo.c b/arch/ia64/kernel/salinfo.c
index 52c404b08904..aba1f463a8dd 100644
--- a/arch/ia64/kernel/salinfo.c
+++ b/arch/ia64/kernel/salinfo.c
@@ -54,8 +54,6 @@ MODULE_AUTHOR("Jesse Barnes <jbarnes@sgi.com>");
 MODULE_DESCRIPTION("/proc interface to IA-64 SAL features");
 MODULE_LICENSE("GPL");
 
-static const struct file_operations proc_salinfo_fops;
-
 typedef struct {
         const char              *name;          /* name of the proc entry */
         unsigned long           feature;        /* feature bit */
@@ -578,6 +576,17 @@ static int salinfo_cpu_pre_down(unsigned int cpu)
         return 0;
 }
 
+/*
+ * 'data' contains an integer that corresponds to the feature we're
+ * testing
+ */
+static int proc_salinfo_show(struct seq_file *m, void *v)
+{
+        unsigned long data = (unsigned long)v;
+        seq_puts(m, (sal_platform_features & data) ? "1\n" : "0\n");
+        return 0;
+}
+
 static int __init
 salinfo_init(void)
 {
@@ -593,9 +602,9 @@ salinfo_init(void)
 
         for (i=0; i < NR_SALINFO_ENTRIES; i++) {
                 /* pass the feature bit in question as misc data */
-                *sdir++ = proc_create_data(salinfo_entries[i].name, 0, salinfo_dir,
-                                           &proc_salinfo_fops,
-                                           (void *)salinfo_entries[i].feature);
+                *sdir++ = proc_create_single_data(salinfo_entries[i].name, 0,
+                                salinfo_dir, proc_salinfo_show,
+                                (void *)salinfo_entries[i].feature);
         }
 
         for (i = 0; i < ARRAY_SIZE(salinfo_log_name); i++) {
@@ -633,27 +642,4 @@ salinfo_init(void)
         return 0;
 }
 
-/*
- * 'data' contains an integer that corresponds to the feature we're
- * testing
- */
-static int proc_salinfo_show(struct seq_file *m, void *v)
-{
-        unsigned long data = (unsigned long)v;
-        seq_puts(m, (sal_platform_features & data) ? "1\n" : "0\n");
-        return 0;
-}
-
-static int proc_salinfo_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, proc_salinfo_show, PDE_DATA(inode));
-}
-
-static const struct file_operations proc_salinfo_fops = {
-        .open           = proc_salinfo_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 module_init(salinfo_init);
diff --git a/arch/ia64/sn/kernel/sn2/prominfo_proc.c b/arch/ia64/sn/kernel/sn2/prominfo_proc.c
index ec4de2b09653..e15457bf21ac 100644
--- a/arch/ia64/sn/kernel/sn2/prominfo_proc.c
+++ b/arch/ia64/sn/kernel/sn2/prominfo_proc.c
@@ -140,18 +140,6 @@ static int proc_fit_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int proc_fit_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, proc_fit_show, PDE_DATA(inode));
-}
-
-static const struct file_operations proc_fit_fops = {
-        .open           = proc_fit_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static int proc_version_show(struct seq_file *m, void *v)
 {
         unsigned long nasid = (unsigned long)m->private;
@@ -174,18 +162,6 @@ static int proc_version_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int proc_version_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, proc_version_show, PDE_DATA(inode));
-}
-
-static const struct file_operations proc_version_fops = {
-        .open           = proc_version_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 /* module entry points */
 int __init prominfo_init(void);
 void __exit prominfo_exit(void);
@@ -217,10 +193,10 @@ int __init prominfo_init(void)
                 if (!dir)
                         continue;
                 nasid = cnodeid_to_nasid(cnodeid);
-                proc_create_data("fit", 0, dir,
-                                 &proc_fit_fops, (void *)nasid);
-                proc_create_data("version", 0, dir,
-                                 &proc_version_fops, (void *)nasid);
+                proc_create_single_data("fit", 0, dir, proc_fit_show, 
+                                (void *)nasid);
+                proc_create_single_data("version", 0, dir, proc_version_show,
+                                (void *)nasid);
         }
         return 0;
 }
diff --git a/arch/ia64/sn/kernel/sn2/sn_proc_fs.c b/arch/ia64/sn/kernel/sn2/sn_proc_fs.c
index 29cf8f8c08e9..c2a4d84297b0 100644
--- a/arch/ia64/sn/kernel/sn2/sn_proc_fs.c
+++ b/arch/ia64/sn/kernel/sn2/sn_proc_fs.c
@@ -18,33 +18,18 @@ static int partition_id_show(struct seq_file *s, void *p)
         return 0;
 }
 
-static int partition_id_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, partition_id_show, NULL);
-}
-
 static int system_serial_number_show(struct seq_file *s, void *p)
 {
         seq_printf(s, "%s\n", sn_system_serial_number());
         return 0;
 }
 
-static int system_serial_number_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, system_serial_number_show, NULL);
-}
-
 static int licenseID_show(struct seq_file *s, void *p)
 {
         seq_printf(s, "0x%llx\n", sn_partition_serial_number_val());
         return 0;
 }
 
-static int licenseID_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, licenseID_show, NULL);
-}
-
 static int coherence_id_show(struct seq_file *s, void *p)
 {
         seq_printf(s, "%d\n", partition_coherence_id());
@@ -52,43 +37,10 @@ static int coherence_id_show(struct seq_file *s, void *p)
         return 0;
 }
 
-static int coherence_id_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, coherence_id_show, NULL);
-}
-
 /* /proc/sgi_sn/sn_topology uses seq_file, see sn_hwperf.c */
 extern int sn_topology_open(struct inode *, struct file *);
 extern int sn_topology_release(struct inode *, struct file *);
 
-static const struct file_operations proc_partition_id_fops = {
-        .open           = partition_id_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
-static const struct file_operations proc_system_sn_fops = {
-        .open           = system_serial_number_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
-static const struct file_operations proc_license_id_fops = {
-        .open           = licenseID_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
-static const struct file_operations proc_coherence_id_fops = {
-        .open           = coherence_id_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static const struct file_operations proc_sn_topo_fops = {
         .open           = sn_topology_open,
         .read           = seq_read,
@@ -104,13 +56,13 @@ void register_sn_procfs(void)
         if (!(sgi_proc_dir = proc_mkdir("sgi_sn", NULL)))
                 return;
 
-        proc_create("partition_id", 0444, sgi_proc_dir,
-                    &proc_partition_id_fops);
-        proc_create("system_serial_number", 0444, sgi_proc_dir,
-                    &proc_system_sn_fops);
-        proc_create("licenseID", 0444, sgi_proc_dir, &proc_license_id_fops);
-        proc_create("coherence_id", 0444, sgi_proc_dir,
-                    &proc_coherence_id_fops);
+        proc_create_single("partition_id", 0444, sgi_proc_dir,
+                        partition_id_show);
+        proc_create_single("system_serial_number", 0444, sgi_proc_dir,
+                        system_serial_number_show);
+        proc_create_single("licenseID", 0444, sgi_proc_dir, licenseID_show);
+        proc_create_single("coherence_id", 0444, sgi_proc_dir,
+                        coherence_id_show);
         proc_create("sn_topology", 0444, sgi_proc_dir, &proc_sn_topo_fops);
 }
 
diff --git a/arch/m68k/kernel/setup_mm.c b/arch/m68k/kernel/setup_mm.c
index dd25bfc22fb4..f35e3ebd6331 100644
--- a/arch/m68k/kernel/setup_mm.c
+++ b/arch/m68k/kernel/setup_mm.c
@@ -527,21 +527,9 @@ static int hardware_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int hardware_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, hardware_proc_show, NULL);
-}
-
-static const struct file_operations hardware_proc_fops = {
-        .open           = hardware_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static int __init proc_hardware_init(void)
 {
-        proc_create("hardware", 0, NULL, &hardware_proc_fops);
+        proc_create_single("hardware", 0, NULL, hardware_proc_show);
         return 0;
 }
 module_init(proc_hardware_init);
diff --git a/arch/mips/pci/ops-pmcmsp.c b/arch/mips/pci/ops-pmcmsp.c
index dd2d9f7e9412..7649372103af 100644
--- a/arch/mips/pci/ops-pmcmsp.c
+++ b/arch/mips/pci/ops-pmcmsp.c
@@ -83,18 +83,6 @@ static int show_msp_pci_counts(struct seq_file *m, void *v)
         return 0;
 }
 
-static int msp_pci_rd_cnt_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, show_msp_pci_counts, NULL);
-}
-
-static const struct file_operations msp_pci_rd_cnt_fops = {
-        .open           = msp_pci_rd_cnt_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 /*****************************************************************************
  *
  *  FUNCTION: gen_pci_cfg_wr_show
@@ -160,18 +148,6 @@ static int gen_pci_cfg_wr_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int gen_pci_cfg_wr_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, gen_pci_cfg_wr_show, NULL);
-}
-
-static const struct file_operations gen_pci_cfg_wr_fops = {
-        .open           = gen_pci_cfg_wr_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 /*****************************************************************************
  *
  *  FUNCTION: pci_proc_init
@@ -188,8 +164,8 @@ static const struct file_operations gen_pci_cfg_wr_fops = {
  ****************************************************************************/
 static void pci_proc_init(void)
 {
-        proc_create("pmc_msp_pci_rd_cnt", 0, NULL, &msp_pci_rd_cnt_fops);
-        proc_create("pmc_msp_pci_cfg_wr", 0, NULL, &gen_pci_cfg_wr_fops);
+        proc_create_single("pmc_msp_pci_rd_cnt", 0, NULL, show_msp_pci_counts);
+        proc_create_single("pmc_msp_pci_cfg_wr", 0, NULL, gen_pci_cfg_wr_show);
 }
 #endif /* CONFIG_PROC_FS && PCI_COUNTERS */
 
diff --git a/arch/mips/sibyte/common/bus_watcher.c b/arch/mips/sibyte/common/bus_watcher.c
index a4e55999ecb4..4bb85de9229b 100644
--- a/arch/mips/sibyte/common/bus_watcher.c
+++ b/arch/mips/sibyte/common/bus_watcher.c
@@ -142,24 +142,12 @@ static int bw_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int bw_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, bw_proc_show, PDE_DATA(inode));
-}
-
-static const struct file_operations bw_proc_fops = {
-        .open           = bw_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static void create_proc_decoder(struct bw_stats_struct *stats)
 {
         struct proc_dir_entry *ent;
 
-        ent = proc_create_data("bus_watcher", S_IWUSR | S_IRUGO, NULL,
-                               &bw_proc_fops, stats);
+        ent = proc_create_single_data("bus_watcher", S_IWUSR | S_IRUGO, NULL,
+                        bw_proc_show, stats);
         if (!ent) {
                 printk(KERN_INFO "Unable to initialize bus_watcher /proc entry\n");
                 return;
diff --git a/arch/parisc/kernel/pci-dma.c b/arch/parisc/kernel/pci-dma.c
index 91bc0cac03a1..6df07ce4f3c2 100644
--- a/arch/parisc/kernel/pci-dma.c
+++ b/arch/parisc/kernel/pci-dma.c
@@ -367,19 +367,6 @@ static int proc_pcxl_dma_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int proc_pcxl_dma_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, proc_pcxl_dma_show, NULL);
-}
-
-static const struct file_operations proc_pcxl_dma_ops = {
-        .owner          = THIS_MODULE,
-        .open           = proc_pcxl_dma_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static int __init
 pcxl_dma_init(void)
 {
@@ -397,8 +384,8 @@ pcxl_dma_init(void)
                         "pcxl_dma_init: Unable to create gsc /proc dir entry\n");
         else {
                 struct proc_dir_entry* ent;
-                ent = proc_create("pcxl_dma", 0, proc_gsc_root,
-                                  &proc_pcxl_dma_ops);
+                ent = proc_create_single("pcxl_dma", 0, proc_gsc_root,
+                                proc_pcxl_dma_show);
                 if (!ent)
                         printk(KERN_WARNING
                                 "pci-dma.c: Unable to create pcxl_dma /proc entry.\n");
diff --git a/arch/parisc/kernel/pdc_chassis.c b/arch/parisc/kernel/pdc_chassis.c
index 3e04242de5a7..28e07482b0f1 100644
--- a/arch/parisc/kernel/pdc_chassis.c
+++ b/arch/parisc/kernel/pdc_chassis.c
@@ -266,18 +266,6 @@ static int pdc_chassis_warn_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int pdc_chassis_warn_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, pdc_chassis_warn_show, NULL);
-}
-
-static const struct file_operations pdc_chassis_warn_fops = {
-        .open           = pdc_chassis_warn_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static int __init pdc_chassis_create_procfs(void)
 {
         unsigned long test;
@@ -292,7 +280,7 @@ static int __init pdc_chassis_create_procfs(void)
 
         printk(KERN_INFO "Enabling PDC chassis warnings support v%s\n",
                         PDC_CHASSIS_VER);
-        proc_create("chassis", 0400, NULL, &pdc_chassis_warn_fops);
+        proc_create_single("chassis", 0400, NULL, pdc_chassis_warn_show);
         return 0;
 }
 
diff --git a/arch/powerpc/kernel/eeh.c b/arch/powerpc/kernel/eeh.c
index bc640e4c5ca5..90bb39b1a23c 100644
--- a/arch/powerpc/kernel/eeh.c
+++ b/arch/powerpc/kernel/eeh.c
@@ -1775,18 +1775,6 @@ static int proc_eeh_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int proc_eeh_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, proc_eeh_show, NULL);
-}
-
-static const struct file_operations proc_eeh_operations = {
-        .open      = proc_eeh_open,
-        .read      = seq_read,
-        .llseek    = seq_lseek,
-        .release   = single_release,
-};
-
 #ifdef CONFIG_DEBUG_FS
 static int eeh_enable_dbgfs_set(void *data, u64 val)
 {
@@ -1828,7 +1816,7 @@ DEFINE_SIMPLE_ATTRIBUTE(eeh_freeze_dbgfs_ops, eeh_freeze_dbgfs_get,
 static int __init eeh_init_proc(void)
 {
         if (machine_is(pseries) || machine_is(powernv)) {
-                proc_create("powerpc/eeh", 0, NULL, &proc_eeh_operations);
+                proc_create_single("powerpc/eeh", 0, NULL, proc_eeh_show);
 #ifdef CONFIG_DEBUG_FS
                 debugfs_create_file("eeh_enable", 0600,
                                     powerpc_debugfs_root, NULL,
diff --git a/arch/powerpc/kernel/rtas-proc.c b/arch/powerpc/kernel/rtas-proc.c
index fb070d8cad07..d49063d0baa4 100644
--- a/arch/powerpc/kernel/rtas-proc.c
+++ b/arch/powerpc/kernel/rtas-proc.c
@@ -154,18 +154,6 @@ static ssize_t ppc_rtas_tone_volume_write(struct file *file,
 static int ppc_rtas_tone_volume_show(struct seq_file *m, void *v);
 static int ppc_rtas_rmo_buf_show(struct seq_file *m, void *v);
 
-static int sensors_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, ppc_rtas_sensors_show, NULL);
-}
-
-static const struct file_operations ppc_rtas_sensors_operations = {
-        .open           = sensors_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static int poweron_open(struct inode *inode, struct file *file)
 {
         return single_open(file, ppc_rtas_poweron_show, NULL);
@@ -231,18 +219,6 @@ static const struct file_operations ppc_rtas_tone_volume_operations = {
         .release        = single_release,
 };
 
-static int rmo_buf_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, ppc_rtas_rmo_buf_show, NULL);
-}
-
-static const struct file_operations ppc_rtas_rmo_buf_ops = {
-        .open           = rmo_buf_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static int ppc_rtas_find_all_sensors(void);
 static void ppc_rtas_process_sensor(struct seq_file *m,
         struct individual_sensor *s, int state, int error, const char *loc);
@@ -267,14 +243,14 @@ static int __init proc_rtas_init(void)
                     &ppc_rtas_clock_operations);
         proc_create("powerpc/rtas/poweron", 0644, NULL,
                     &ppc_rtas_poweron_operations);
-        proc_create("powerpc/rtas/sensors", 0444, NULL,
-                    &ppc_rtas_sensors_operations);
+        proc_create_single("powerpc/rtas/sensors", 0444, NULL,
+                        ppc_rtas_sensors_show);
         proc_create("powerpc/rtas/frequency", 0644, NULL,
                     &ppc_rtas_tone_freq_operations);
         proc_create("powerpc/rtas/volume", 0644, NULL,
                     &ppc_rtas_tone_volume_operations);
-        proc_create("powerpc/rtas/rmo_buffer", 0400, NULL,
-                    &ppc_rtas_rmo_buf_ops);
+        proc_create_single("powerpc/rtas/rmo_buffer", 0400, NULL,
+                        ppc_rtas_rmo_buf_show);
         return 0;
 }
 
diff --git a/arch/powerpc/platforms/cell/spufs/sched.c b/arch/powerpc/platforms/cell/spufs/sched.c
index ccc421503363..c9ef3c532169 100644
--- a/arch/powerpc/platforms/cell/spufs/sched.c
+++ b/arch/powerpc/platforms/cell/spufs/sched.c
@@ -1095,18 +1095,6 @@ static int show_spu_loadavg(struct seq_file *s, void *private)
                 atomic_read(&nr_spu_contexts),
                 idr_get_cursor(&task_active_pid_ns(current)->idr) - 1);
         return 0;
-}
-
-static int spu_loadavg_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, show_spu_loadavg, NULL);
-}
-
-static const struct file_operations spu_loadavg_fops = {
-        .open           = spu_loadavg_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
 };
 
 int __init spu_sched_init(void)
@@ -1135,7 +1123,7 @@ int __init spu_sched_init(void)
 
         mod_timer(&spuloadavg_timer, 0);
 
-        entry = proc_create("spu_loadavg", 0, NULL, &spu_loadavg_fops);
+        entry = proc_create_single("spu_loadavg", 0, NULL, show_spu_loadavg);
         if (!entry)
                 goto out_stop_kthread;
 
diff --git a/arch/s390/kernel/sysinfo.c b/arch/s390/kernel/sysinfo.c
index fc7e04c2195b..54f5496913fa 100644
--- a/arch/s390/kernel/sysinfo.c
+++ b/arch/s390/kernel/sysinfo.c
@@ -294,21 +294,9 @@ static int sysinfo_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int sysinfo_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, sysinfo_show, NULL);
-}
-
-static const struct file_operations sysinfo_fops = {
-        .open           = sysinfo_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static int __init sysinfo_create_proc(void)
 {
-        proc_create("sysinfo", 0444, NULL, &sysinfo_fops);
+        proc_create_single("sysinfo", 0444, NULL, sysinfo_show);
         return 0;
 }
 device_initcall(sysinfo_create_proc);
@@ -386,18 +374,6 @@ static const struct seq_operations service_level_seq_ops = {
         .show           = service_level_show
 };
 
-static int service_level_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &service_level_seq_ops);
-}
-
-static const struct file_operations service_level_ops = {
-        .open           = service_level_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release
-};
-
 static void service_level_vm_print(struct seq_file *m,
                                    struct service_level *slr)
 {
@@ -420,7 +396,7 @@ static struct service_level service_level_vm = {
 
 static __init int create_proc_service_level(void)
 {
-        proc_create("service_levels", 0, NULL, &service_level_ops);
+        proc_create_seq("service_levels", 0, NULL, &service_level_seq_ops);
         if (MACHINE_IS_VM)
                 register_service_level(&service_level_vm);
         return 0;
diff --git a/arch/sh/drivers/dma/dma-api.c b/arch/sh/drivers/dma/dma-api.c
index c0eec08d8f95..b05be597b19f 100644
--- a/arch/sh/drivers/dma/dma-api.c
+++ b/arch/sh/drivers/dma/dma-api.c
@@ -339,18 +339,6 @@ static int dma_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int dma_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, dma_proc_show, NULL);
-}
-
-static const struct file_operations dma_proc_fops = {
-        .open           = dma_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 int register_dmac(struct dma_info *info)
 {
         unsigned int total_channels, i;
@@ -423,7 +411,7 @@ EXPORT_SYMBOL(unregister_dmac);
 static int __init dma_api_init(void)
 {
         printk(KERN_NOTICE "DMA: Registering DMA API.\n");
-        return proc_create("dma", 0, NULL, &dma_proc_fops) ? 0 : -ENOMEM;
+        return proc_create_single("dma", 0, NULL, dma_proc_show) ? 0 : -ENOMEM;
 }
 subsys_initcall(dma_api_init);
 
diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c
index 3bcef9ce74df..cca9134cfa7d 100644
--- a/arch/sparc/kernel/ioport.c
+++ b/arch/sparc/kernel/ioport.c
@@ -678,25 +678,14 @@ static int sparc_io_proc_show(struct seq_file *m, void *v)
 
         return 0;
 }
-
-static int sparc_io_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, sparc_io_proc_show, PDE_DATA(inode));
-}
-
-static const struct file_operations sparc_io_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = sparc_io_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
 #endif /* CONFIG_PROC_FS */
 
 static void register_proc_sparc_ioport(void)
 {
 #ifdef CONFIG_PROC_FS
-        proc_create_data("io_map", 0, NULL, &sparc_io_proc_fops, &sparc_iomap);
-        proc_create_data("dvma_map", 0, NULL, &sparc_io_proc_fops, &_sparc_dvma);
+        proc_create_single_data("io_map", 0, NULL, sparc_io_proc_show,
+                        &sparc_iomap);
+        proc_create_single_data("dvma_map", 0, NULL, sparc_io_proc_show,
+                        &_sparc_dvma);
 #endif
 }
diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
index d4e8c497ae86..dcf5ea28a281 100644
--- a/arch/um/drivers/ubd_kern.c
+++ b/arch/um/drivers/ubd_kern.c
@@ -208,19 +208,6 @@ static int fake_ide_media_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int fake_ide_media_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, fake_ide_media_proc_show, NULL);
-}
-
-static const struct file_operations fake_ide_media_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = fake_ide_media_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static void make_ide_entries(const char *dev_name)
 {
         struct proc_dir_entry *dir, *ent;
@@ -231,7 +218,8 @@ static void make_ide_entries(const char *dev_name)
         dir = proc_mkdir(dev_name, proc_ide);
         if(!dir) return;
 
-        ent = proc_create("media", S_IRUGO, dir, &fake_ide_media_proc_fops);
+        ent = proc_create_single("media", S_IRUGO, dir,
+                        fake_ide_media_proc_show);
         if(!ent) return;
         snprintf(name, sizeof(name), "ide0/%s", dev_name);
         proc_symlink(dev_name, proc_ide_root, name);
diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
index dfcbe6924eaf..cadeafabf167 100644
--- a/arch/x86/kernel/apm_32.c
+++ b/arch/x86/kernel/apm_32.c
@@ -1715,19 +1715,6 @@ static int proc_apm_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int proc_apm_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, proc_apm_show, NULL);
-}
-
-static const struct file_operations apm_file_ops = {
-        .owner          = THIS_MODULE,
-        .open           = proc_apm_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static int apm(void *unused)
 {
         unsigned short  bx;
@@ -2360,7 +2347,7 @@ static int __init apm_init(void)
         set_desc_base(&gdt[APM_DS >> 3],
                  (unsigned long)__va((unsigned long)apm_info.bios.dseg << 4));
 
-        proc_create("apm", 0, NULL, &apm_file_ops);
+        proc_create_single("apm", 0, NULL, proc_apm_show);
 
         kapmd_task = kthread_create(apm, NULL, "kapmd");
         if (IS_ERR(kapmd_task)) {
diff --git a/arch/xtensa/platforms/iss/console.c b/arch/xtensa/platforms/iss/console.c
index 92f567f9a21e..af81a62faba6 100644
--- a/arch/xtensa/platforms/iss/console.c
+++ b/arch/xtensa/platforms/iss/console.c
@@ -153,19 +153,6 @@ static int rs_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int rs_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, rs_proc_show, NULL);
-}
-
-static const struct file_operations rs_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = rs_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static const struct tty_operations serial_ops = {
         .open = rs_open,
         .close = rs_close,
@@ -176,7 +163,7 @@ static const struct tty_operations serial_ops = {
         .chars_in_buffer = rs_chars_in_buffer,
         .hangup = rs_hangup,
         .wait_until_sent = rs_wait_until_sent,
-        .proc_fops = &rs_proc_fops,
+        .proc_show = rs_proc_show,
 };
 
 int __init rs_init(void)
diff --git a/block/genhd.c b/block/genhd.c
index 4d694035d343..f1543a45e73b 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -1027,18 +1027,6 @@ static const struct seq_operations partitions_op = {
         .stop   = disk_seqf_stop,
         .show   = show_partition
 };
-
-static int partitions_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &partitions_op);
-}
-
-static const struct file_operations proc_partitions_operations = {
-        .open           = partitions_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release,
-};
 #endif
 
 
@@ -1374,22 +1362,10 @@ static const struct seq_operations diskstats_op = {
         .show   = diskstats_show
 };
 
-static int diskstats_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &diskstats_op);
-}
-
-static const struct file_operations proc_diskstats_operations = {
-        .open           = diskstats_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release,
-};
-
 static int __init proc_genhd_init(void)
 {
-        proc_create("diskstats", 0, NULL, &proc_diskstats_operations);
-        proc_create("partitions", 0, NULL, &proc_partitions_operations);
+        proc_create_seq("diskstats", 0, NULL, &diskstats_op);
+        proc_create_seq("partitions", 0, NULL, &partitions_op);
         return 0;
 }
 module_init(proc_genhd_init);
diff --git a/crypto/proc.c b/crypto/proc.c
index 822fcef6d91c..f4eb6139973e 100644
--- a/crypto/proc.c
+++ b/crypto/proc.c
@@ -94,21 +94,9 @@ static const struct seq_operations crypto_seq_ops = {
         .show           = c_show
 };
 
-static int crypto_info_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &crypto_seq_ops);
-}
-        
-static const struct file_operations proc_crypto_ops = {
-        .open           = crypto_info_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release
-};
-
 void __init crypto_init_proc(void)
 {
-        proc_create("crypto", 0, NULL, &proc_crypto_ops);
+        proc_create_seq("crypto", 0, NULL, &crypto_seq_ops);
 }
 
 void __exit crypto_exit_proc(void)
diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c
index 2d8de2f8c1ed..84fdfa70920a 100644
--- a/drivers/acpi/ac.c
+++ b/drivers/acpi/ac.c
@@ -82,7 +82,6 @@ static SIMPLE_DEV_PM_OPS(acpi_ac_pm, NULL, acpi_ac_resume);
 #ifdef CONFIG_ACPI_PROCFS_POWER
 extern struct proc_dir_entry *acpi_lock_ac_dir(void);
 extern void *acpi_unlock_ac_dir(struct proc_dir_entry *acpi_ac_dir);
-static int acpi_ac_open_fs(struct inode *inode, struct file *file);
 #endif
 
 
@@ -111,16 +110,6 @@ struct acpi_ac {
 
 #define to_acpi_ac(x) power_supply_get_drvdata(x)
 
-#ifdef CONFIG_ACPI_PROCFS_POWER
-static const struct file_operations acpi_ac_fops = {
-        .owner = THIS_MODULE,
-        .open = acpi_ac_open_fs,
-        .read = seq_read,
-        .llseek = seq_lseek,
-        .release = single_release,
-};
-#endif
-
 /* --------------------------------------------------------------------------
                                AC Adapter Management
    -------------------------------------------------------------------------- */
@@ -209,11 +198,6 @@ static int acpi_ac_seq_show(struct seq_file *seq, void *offset)
         return 0;
 }
 
-static int acpi_ac_open_fs(struct inode *inode, struct file *file)
-{
-        return single_open(file, acpi_ac_seq_show, PDE_DATA(inode));
-}
-
 static int acpi_ac_add_fs(struct acpi_ac *ac)
 {
         struct proc_dir_entry *entry = NULL;
@@ -228,9 +212,8 @@ static int acpi_ac_add_fs(struct acpi_ac *ac)
         }
 
         /* 'state' [R] */
-        entry = proc_create_data(ACPI_AC_FILE_STATE,
-                                 S_IRUGO, acpi_device_dir(ac->device),
-                                 &acpi_ac_fops, ac);
+        entry = proc_create_single_data(ACPI_AC_FILE_STATE, S_IRUGO,
+                        acpi_device_dir(ac->device), acpi_ac_seq_show, ac);
         if (!entry)
                 return -ENODEV;
         return 0;
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index bdb24d636d9a..76550689ce10 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -81,14 +81,6 @@ MODULE_PARM_DESC(cache_time, "cache time in milliseconds");
 #ifdef CONFIG_ACPI_PROCFS_POWER
 extern struct proc_dir_entry *acpi_lock_battery_dir(void);
 extern void *acpi_unlock_battery_dir(struct proc_dir_entry *acpi_battery_dir);
-
-enum acpi_battery_files {
-        info_tag = 0,
-        state_tag,
-        alarm_tag,
-        ACPI_BATTERY_NUMFILES,
-};
-
 #endif
 
 static const struct acpi_device_id battery_device_ids[] = {
@@ -985,9 +977,10 @@ static const char *acpi_battery_units(const struct acpi_battery *battery)
                 "mA" : "mW";
 }
 
-static int acpi_battery_print_info(struct seq_file *seq, int result)
+static int acpi_battery_info_proc_show(struct seq_file *seq, void *offset)
 {
         struct acpi_battery *battery = seq->private;
+        int result = acpi_battery_update(battery, false);
 
         if (result)
                 goto end;
@@ -1041,9 +1034,10 @@ static int acpi_battery_print_info(struct seq_file *seq, int result)
         return result;
 }
 
-static int acpi_battery_print_state(struct seq_file *seq, int result)
+static int acpi_battery_state_proc_show(struct seq_file *seq, void *offset)
 {
         struct acpi_battery *battery = seq->private;
+        int result = acpi_battery_update(battery, false);
 
         if (result)
                 goto end;
@@ -1088,9 +1082,10 @@ static int acpi_battery_print_state(struct seq_file *seq, int result)
         return result;
 }
 
-static int acpi_battery_print_alarm(struct seq_file *seq, int result)
+static int acpi_battery_alarm_proc_show(struct seq_file *seq, void *offset)
 {
         struct acpi_battery *battery = seq->private;
+        int result = acpi_battery_update(battery, false);
 
         if (result)
                 goto end;
@@ -1142,82 +1137,22 @@ static ssize_t acpi_battery_write_alarm(struct file *file,
         return result;
 }
 
-typedef int(*print_func)(struct seq_file *seq, int result);
-
-static print_func acpi_print_funcs[ACPI_BATTERY_NUMFILES] = {
-        acpi_battery_print_info,
-        acpi_battery_print_state,
-        acpi_battery_print_alarm,
-};
-
-static int acpi_battery_read(int fid, struct seq_file *seq)
+static int acpi_battery_alarm_proc_open(struct inode *inode, struct file *file)
 {
-        struct acpi_battery *battery = seq->private;
-        int result = acpi_battery_update(battery, false);
-        return acpi_print_funcs[fid](seq, result);
+        return single_open(file, acpi_battery_alarm_proc_show, PDE_DATA(inode));
 }
 
-#define DECLARE_FILE_FUNCTIONS(_name) \
-static int acpi_battery_read_##_name(struct seq_file *seq, void *offset) \
-{ \
-        return acpi_battery_read(_name##_tag, seq); \
-} \
-static int acpi_battery_##_name##_open_fs(struct inode *inode, struct file *file) \
-{ \
-        return single_open(file, acpi_battery_read_##_name, PDE_DATA(inode)); \
-}
-
-DECLARE_FILE_FUNCTIONS(info);
-DECLARE_FILE_FUNCTIONS(state);
-DECLARE_FILE_FUNCTIONS(alarm);
-
-#undef DECLARE_FILE_FUNCTIONS
-
-#define FILE_DESCRIPTION_RO(_name) \
-        { \
-        .name = __stringify(_name), \
-        .mode = S_IRUGO, \
-        .ops = { \
-                .open = acpi_battery_##_name##_open_fs, \
-                .read = seq_read, \
-                .llseek = seq_lseek, \
-                .release = single_release, \
-                .owner = THIS_MODULE, \
-                }, \
-        }
-
-#define FILE_DESCRIPTION_RW(_name) \
-        { \
-        .name = __stringify(_name), \
-        .mode = S_IFREG | S_IRUGO | S_IWUSR, \
-        .ops = { \
-                .open = acpi_battery_##_name##_open_fs, \
-                .read = seq_read, \
-                .llseek = seq_lseek, \
-                .write = acpi_battery_write_##_name, \
-                .release = single_release, \
-                .owner = THIS_MODULE, \
-                }, \
-        }
-
-static const struct battery_file {
-        struct file_operations ops;
-        umode_t mode;
-        const char *name;
-} acpi_battery_file[] = {
-        FILE_DESCRIPTION_RO(info),
-        FILE_DESCRIPTION_RO(state),
-        FILE_DESCRIPTION_RW(alarm),
+static const struct file_operations acpi_battery_alarm_fops = {
+        .owner          = THIS_MODULE,
+        .open           = acpi_battery_alarm_proc_open,
+        .read           = seq_read,
+        .write          = acpi_battery_write_alarm,
+        .llseek         = seq_lseek,
+        .release        = single_release,
 };
 
-#undef FILE_DESCRIPTION_RO
-#undef FILE_DESCRIPTION_RW
-
 static int acpi_battery_add_fs(struct acpi_device *device)
 {
-        struct proc_dir_entry *entry = NULL;
-        int i;
-
         printk(KERN_WARNING PREFIX "Deprecated procfs I/F for battery is loaded,"
                         " please retry with CONFIG_ACPI_PROCFS_POWER cleared\n");
         if (!acpi_device_dir(device)) {
@@ -1227,28 +1162,24 @@ static int acpi_battery_add_fs(struct acpi_device *device)
                         return -ENODEV;
         }
 
-        for (i = 0; i < ACPI_BATTERY_NUMFILES; ++i) {
-                entry = proc_create_data(acpi_battery_file[i].name,
-                                         acpi_battery_file[i].mode,
-                                         acpi_device_dir(device),
-                                         &acpi_battery_file[i].ops,
-                                         acpi_driver_data(device));
-                if (!entry)
-                        return -ENODEV;
-        }
+        if (!proc_create_single_data("info", S_IRUGO, acpi_device_dir(device),
+                        acpi_battery_info_proc_show, acpi_driver_data(device)))
+                return -ENODEV;
+        if (!proc_create_single_data("state", S_IRUGO, acpi_device_dir(device),
+                        acpi_battery_state_proc_show, acpi_driver_data(device)))
+                return -ENODEV;
+        if (!proc_create_data("alarm", S_IFREG | S_IRUGO | S_IWUSR,
+                        acpi_device_dir(device), &acpi_battery_alarm_fops,
+                        acpi_driver_data(device)))
+                return -ENODEV;
         return 0;
 }
 
 static void acpi_battery_remove_fs(struct acpi_device *device)
 {
-        int i;
         if (!acpi_device_dir(device))
                 return;
-        for (i = 0; i < ACPI_BATTERY_NUMFILES; ++i)
-                remove_proc_entry(acpi_battery_file[i].name,
-                                  acpi_device_dir(device));
-
-        remove_proc_entry(acpi_device_bid(device), acpi_battery_dir);
+        remove_proc_subtree(acpi_device_bid(device), acpi_battery_dir);
         acpi_device_dir(device) = NULL;
 }
 
diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c
index f1cc4f9d31cd..2345a5ee2dbb 100644
--- a/drivers/acpi/button.c
+++ b/drivers/acpi/button.c
@@ -263,19 +263,6 @@ static int acpi_button_state_seq_show(struct seq_file *seq, void *offset)
         return 0;
 }
 
-static int acpi_button_state_open_fs(struct inode *inode, struct file *file)
-{
-        return single_open(file, acpi_button_state_seq_show, PDE_DATA(inode));
-}
-
-static const struct file_operations acpi_button_state_fops = {
-        .owner = THIS_MODULE,
-        .open = acpi_button_state_open_fs,
-        .read = seq_read,
-        .llseek = seq_lseek,
-        .release = single_release,
-};
-
 static int acpi_button_add_fs(struct acpi_device *device)
 {
         struct acpi_button *button = acpi_driver_data(device);
@@ -311,9 +298,9 @@ static int acpi_button_add_fs(struct acpi_device *device)
         }
 
         /* create /proc/acpi/button/lid/LID/state */
-        entry = proc_create_data(ACPI_BUTTON_FILE_STATE,
-                                 S_IRUGO, acpi_device_dir(device),
-                                 &acpi_button_state_fops, device);
+        entry = proc_create_single_data(ACPI_BUTTON_FILE_STATE, S_IRUGO,
+                        acpi_device_dir(device), acpi_button_state_seq_show,
+                        device);
         if (!entry) {
                 ret = -ENODEV;
                 goto remove_dev_dir;
diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c
index 7c3887a7e534..6ca77d6047d6 100644
--- a/drivers/block/DAC960.c
+++ b/drivers/block/DAC960.c
@@ -6446,19 +6446,6 @@ static int dac960_proc_show(struct seq_file *m, void *v)
   return 0;
 }
 
-static int dac960_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, dac960_proc_show, NULL);
-}
-
-static const struct file_operations dac960_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = dac960_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static int dac960_initial_status_proc_show(struct seq_file *m, void *v)
 {
         DAC960_Controller_T *Controller = (DAC960_Controller_T *)m->private;
@@ -6466,19 +6453,6 @@ static int dac960_initial_status_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int dac960_initial_status_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, dac960_initial_status_proc_show, PDE_DATA(inode));
-}
-
-static const struct file_operations dac960_initial_status_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = dac960_initial_status_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static int dac960_current_status_proc_show(struct seq_file *m, void *v)
 {
   DAC960_Controller_T *Controller = (DAC960_Controller_T *) m->private;
@@ -6512,19 +6486,6 @@ static int dac960_current_status_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int dac960_current_status_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, dac960_current_status_proc_show, PDE_DATA(inode));
-}
-
-static const struct file_operations dac960_current_status_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = dac960_current_status_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static int dac960_user_command_proc_show(struct seq_file *m, void *v)
 {
         DAC960_Controller_T *Controller = (DAC960_Controller_T *)m->private;
@@ -6579,16 +6540,18 @@ static void DAC960_CreateProcEntries(DAC960_Controller_T *Controller)
 
         if (DAC960_ProcDirectoryEntry == NULL) {
                 DAC960_ProcDirectoryEntry = proc_mkdir("rd", NULL);
-                proc_create("status", 0, DAC960_ProcDirectoryEntry,
-                            &dac960_proc_fops);
+                proc_create_single("status", 0, DAC960_ProcDirectoryEntry,
+                                dac960_proc_show);
         }
 
         snprintf(Controller->ControllerName, sizeof(Controller->ControllerName),
                  "c%d", Controller->ControllerNumber);
         ControllerProcEntry = proc_mkdir(Controller->ControllerName,
                                          DAC960_ProcDirectoryEntry);
-        proc_create_data("initial_status", 0, ControllerProcEntry, &dac960_initial_status_proc_fops, Controller);
-        proc_create_data("current_status", 0, ControllerProcEntry, &dac960_current_status_proc_fops, Controller);
+        proc_create_single_data("initial_status", 0, ControllerProcEntry,
+                        dac960_initial_status_proc_show, Controller);
+        proc_create_single_data("current_status", 0, ControllerProcEntry,
+                        dac960_current_status_proc_show, Controller);
         proc_create_data("user_command", 0600, ControllerProcEntry, &dac960_user_command_proc_fops, Controller);
         Controller->ControllerProcEntry = ControllerProcEntry;
 }
diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
index 21b4186add6f..bc4ed2ed40a2 100644
--- a/drivers/block/drbd/drbd_int.h
+++ b/drivers/block/drbd/drbd_int.h
@@ -1643,7 +1643,7 @@ void drbd_bump_write_ordering(struct drbd_resource *resource, struct drbd_backin
 
 /* drbd_proc.c */
 extern struct proc_dir_entry *drbd_proc;
-extern const struct file_operations drbd_proc_fops;
+int drbd_seq_show(struct seq_file *seq, void *v);
 
 /* drbd_actlog.c */
 extern bool drbd_al_begin_io_prepare(struct drbd_device *device, struct drbd_interval *i);
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index a233e71e58ff..7655d6133139 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -2989,7 +2989,7 @@ static int __init drbd_init(void)
                 goto fail;
 
         err = -ENOMEM;
-        drbd_proc = proc_create_data("drbd", S_IFREG | 0444 , NULL, &drbd_proc_fops, NULL);
+        drbd_proc = proc_create_single("drbd", S_IFREG | 0444 , NULL, drbd_seq_show);
         if (!drbd_proc) {
                 pr_err("unable to register proc file\n");
                 goto fail;
diff --git a/drivers/block/drbd/drbd_proc.c b/drivers/block/drbd/drbd_proc.c
index 582caeb0de86..74ef29247bb5 100644
--- a/drivers/block/drbd/drbd_proc.c
+++ b/drivers/block/drbd/drbd_proc.c
@@ -33,18 +33,7 @@
 #include <linux/drbd.h>
 #include "drbd_int.h"
 
-static int drbd_proc_open(struct inode *inode, struct file *file);
-static int drbd_proc_release(struct inode *inode, struct file *file);
-
-
 struct proc_dir_entry *drbd_proc;
-const struct file_operations drbd_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = drbd_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = drbd_proc_release,
-};
 
 static void seq_printf_with_thousands_grouping(struct seq_file *seq, long v)
 {
@@ -235,7 +224,7 @@ static void drbd_syncer_progress(struct drbd_device *device, struct seq_file *se
         }
 }
 
-static int drbd_seq_show(struct seq_file *seq, void *v)
+int drbd_seq_show(struct seq_file *seq, void *v)
 {
         int i, prev_i = -1;
         const char *sn;
@@ -345,24 +334,3 @@ static int drbd_seq_show(struct seq_file *seq, void *v)
 
         return 0;
 }
-
-static int drbd_proc_open(struct inode *inode, struct file *file)
-{
-        int err;
-
-        if (try_module_get(THIS_MODULE)) {
-                err = single_open(file, drbd_seq_show, NULL);
-                if (err)
-                        module_put(THIS_MODULE);
-                return err;
-        }
-        return -ENODEV;
-}
-
-static int drbd_proc_release(struct inode *inode, struct file *file)
-{
-        module_put(THIS_MODULE);
-        return single_release(inode, file);
-}
-
-/* PROC FS stuff end */
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index 1a2c0101cfcb..b3f83cd96f33 100644
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -2538,18 +2538,6 @@ static int pkt_seq_show(struct seq_file *m, void *p)
         return 0;
 }
 
-static int pkt_seq_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, pkt_seq_show, PDE_DATA(inode));
-}
-
-static const struct file_operations pkt_proc_fops = {
-        .open   = pkt_seq_open,
-        .read   = seq_read,
-        .llseek = seq_lseek,
-        .release = single_release
-};
-
 static int pkt_new_dev(struct pktcdvd_device *pd, dev_t dev)
 {
         int i;
@@ -2604,7 +2592,7 @@ static int pkt_new_dev(struct pktcdvd_device *pd, dev_t dev)
                 goto out_mem;
         }
 
-        proc_create_data(pd->name, 0, pkt_proc, &pkt_proc_fops, pd);
+        proc_create_single_data(pd->name, 0, pkt_proc, pkt_seq_show, pd);
         pkt_dbg(1, pd, "writer mapped to %s\n", bdevname(bdev, b));
         return 0;
 
diff --git a/drivers/block/ps3vram.c b/drivers/block/ps3vram.c
index 6a55959cbf78..8fa4533a1249 100644
--- a/drivers/block/ps3vram.c
+++ b/drivers/block/ps3vram.c
@@ -521,26 +521,13 @@ static int ps3vram_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int ps3vram_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, ps3vram_proc_show, PDE_DATA(inode));
-}
-
-static const struct file_operations ps3vram_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = ps3vram_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static void ps3vram_proc_init(struct ps3_system_bus_device *dev)
 {
         struct ps3vram_priv *priv = ps3_system_bus_get_drvdata(dev);
         struct proc_dir_entry *pde;
 
-        pde = proc_create_data(DEVICE_NAME, 0444, NULL, &ps3vram_proc_fops,
-                               priv);
+        pde = proc_create_single_data(DEVICE_NAME, 0444, NULL,
+                        ps3vram_proc_show, priv);
         if (!pde)
                 dev_warn(&dev->core, "failed to create /proc entry\n");
 }
diff --git a/drivers/char/apm-emulation.c b/drivers/char/apm-emulation.c
index a5e2f9e557ea..53436c03dbce 100644
--- a/drivers/char/apm-emulation.c
+++ b/drivers/char/apm-emulation.c
@@ -461,19 +461,6 @@ static int proc_apm_show(struct seq_file *m, void *v)
 
         return 0;
 }
-
-static int proc_apm_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, proc_apm_show, NULL);
-}
-
-static const struct file_operations apm_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = proc_apm_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
 #endif
 
 static int kapmd(void *arg)
@@ -657,7 +644,7 @@ static int __init apm_init(void)
         wake_up_process(kapmd_tsk);
 
 #ifdef CONFIG_PROC_FS
-        proc_create("apm", 0, NULL, &apm_proc_fops);
+        proc_create_single("apm", 0, NULL, proc_apm_show);
 #endif
 
         ret = misc_register(&apm_device);
diff --git a/drivers/char/ds1620.c b/drivers/char/ds1620.c
index eb53cbadb68f..a5ecf6dae02e 100644
--- a/drivers/char/ds1620.c
+++ b/drivers/char/ds1620.c
@@ -345,18 +345,6 @@ static int ds1620_proc_therm_show(struct seq_file *m, void *v)
                    fan_state[netwinder_get_fan()]);
         return 0;
 }
-
-static int ds1620_proc_therm_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, ds1620_proc_therm_show, NULL);
-}
-
-static const struct file_operations ds1620_proc_therm_fops = {
-        .open           = ds1620_proc_therm_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
 #endif
 
 static const struct file_operations ds1620_fops = {
@@ -404,7 +392,7 @@ static int __init ds1620_init(void)
                 return ret;
 
 #ifdef THERM_USE_PROC
-        if (!proc_create("therm", 0, NULL, &ds1620_proc_therm_fops))
+        if (!proc_create_single("therm", 0, NULL, ds1620_proc_therm_show))
                 printk(KERN_ERR "therm: unable to register /proc/therm\n");
 #endif
 
diff --git a/drivers/char/efirtc.c b/drivers/char/efirtc.c
index dc62568b7dde..d9aab643997e 100644
--- a/drivers/char/efirtc.c
+++ b/drivers/char/efirtc.c
@@ -358,19 +358,6 @@ static int efi_rtc_proc_show(struct seq_file *m, void *v)
 
         return 0;
 }
-
-static int efi_rtc_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, efi_rtc_proc_show, NULL);
-}
-
-static const struct file_operations efi_rtc_proc_fops = {
-        .open           = efi_rtc_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static int __init 
 efi_rtc_init(void)
 {
@@ -386,7 +373,7 @@ efi_rtc_init(void)
                 return ret;
         }
 
-        dir = proc_create("driver/efirtc", 0, NULL, &efi_rtc_proc_fops);
+        dir = proc_create_single("driver/efirtc", 0, NULL, efi_rtc_proc_show);
         if (dir == NULL) {
                 printk(KERN_ERR "efirtc: can't create /proc/driver/efirtc.\n");
                 misc_deregister(&efi_rtc_dev);
diff --git a/drivers/char/misc.c b/drivers/char/misc.c
index 1bb9e7cc82e3..53cfe574d8d4 100644
--- a/drivers/char/misc.c
+++ b/drivers/char/misc.c
@@ -95,19 +95,6 @@ static const struct seq_operations misc_seq_ops = {
         .stop  = misc_seq_stop,
         .show  = misc_seq_show,
 };
-
-static int misc_seq_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &misc_seq_ops);
-}
-
-static const struct file_operations misc_proc_fops = {
-        .owner   = THIS_MODULE,
-        .open    = misc_seq_open,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
-        .release = seq_release,
-};
 #endif
 
 static int misc_open(struct inode *inode, struct file *file)
@@ -282,7 +269,7 @@ static int __init misc_init(void)
         int err;
         struct proc_dir_entry *ret;
 
-        ret = proc_create("misc", 0, NULL, &misc_proc_fops);
+        ret = proc_create_seq("misc", 0, NULL, &misc_seq_ops);
         misc_class = class_create(THIS_MODULE, "misc");
         err = PTR_ERR(misc_class);
         if (IS_ERR(misc_class))
diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c
index 678fa97e41fb..25264d65e716 100644
--- a/drivers/char/nvram.c
+++ b/drivers/char/nvram.c
@@ -389,22 +389,9 @@ static int nvram_proc_read(struct seq_file *seq, void *offset)
         return 0;
 }
 
-static int nvram_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, nvram_proc_read, NULL);
-}
-
-static const struct file_operations nvram_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = nvram_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static int nvram_add_proc_fs(void)
 {
-        if (!proc_create("driver/nvram", 0, NULL, &nvram_proc_fops))
+        if (!proc_create_single("driver/nvram", 0, NULL, nvram_proc_read))
                 return -ENOMEM;
         return 0;
 }
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
index aa502e9fb7fa..66b04194aa9f 100644
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
@@ -2616,19 +2616,6 @@ static int mgslpc_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int mgslpc_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, mgslpc_proc_show, NULL);
-}
-
-static const struct file_operations mgslpc_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = mgslpc_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static int rx_alloc_buffers(MGSLPC_INFO *info)
 {
         /* each buffer has header and data */
@@ -2815,7 +2802,7 @@ static const struct tty_operations mgslpc_ops = {
         .tiocmget = tiocmget,
         .tiocmset = tiocmset,
         .get_icount = mgslpc_get_icount,
-        .proc_fops = &mgslpc_proc_fops,
+        .proc_show = mgslpc_proc_show,
 };
 
 static int __init synclink_cs_init(void)
diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c
index 57dc546628b5..94fedeeec035 100644
--- a/drivers/char/rtc.c
+++ b/drivers/char/rtc.c
@@ -171,7 +171,7 @@ static void mask_rtc_irq_bit(unsigned char bit)
 #endif
 
 #ifdef CONFIG_PROC_FS
-static int rtc_proc_open(struct inode *inode, struct file *file);
+static int rtc_proc_show(struct seq_file *seq, void *v);
 #endif
 
 /*
@@ -832,16 +832,6 @@ static struct miscdevice rtc_dev = {
         .fops           = &rtc_fops,
 };
 
-#ifdef CONFIG_PROC_FS
-static const struct file_operations rtc_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = rtc_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-#endif
-
 static resource_size_t rtc_size;
 
 static struct resource * __init rtc_request_region(resource_size_t size)
@@ -982,7 +972,7 @@ no_irq:
         }
 
 #ifdef CONFIG_PROC_FS
-        ent = proc_create("driver/rtc", 0, NULL, &rtc_proc_fops);
+        ent = proc_create_single("driver/rtc", 0, NULL, rtc_proc_show);
         if (!ent)
                 printk(KERN_WARNING "rtc: Failed to register with procfs.\n");
 #endif
@@ -1201,11 +1191,6 @@ static int rtc_proc_show(struct seq_file *seq, void *v)
 #undef YN
 #undef NY
 }
-
-static int rtc_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, rtc_proc_show, NULL);
-}
 #endif
 
 static void rtc_get_rtc_time(struct rtc_time *rtc_tm)
diff --git a/drivers/char/toshiba.c b/drivers/char/toshiba.c
index 5488516da8ea..802376fe851a 100644
--- a/drivers/char/toshiba.c
+++ b/drivers/char/toshiba.c
@@ -326,19 +326,6 @@ static int proc_toshiba_show(struct seq_file *m, void *v)
                 key);
         return 0;
 }
-
-static int proc_toshiba_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, proc_toshiba_show, NULL);
-}
-
-static const struct file_operations proc_toshiba_fops = {
-        .owner          = THIS_MODULE,
-        .open           = proc_toshiba_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
 #endif
 
 
@@ -524,7 +511,7 @@ static int __init toshiba_init(void)
         {
                 struct proc_dir_entry *pde;
 
-                pde = proc_create("toshiba", 0, NULL, &proc_toshiba_fops);
+                pde = proc_create_single("toshiba", 0, NULL, proc_toshiba_show);
                 if (!pde) {
                         misc_deregister(&tosh_device);
                         return -ENOMEM;
diff --git a/drivers/connector/connector.c b/drivers/connector/connector.c
index 8615594bd065..e718b8c69a56 100644
--- a/drivers/connector/connector.c
+++ b/drivers/connector/connector.c
@@ -260,19 +260,6 @@ static int cn_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int cn_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, cn_proc_show, NULL);
-}
-
-static const struct file_operations cn_file_ops = {
-        .owner   = THIS_MODULE,
-        .open    = cn_proc_open,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
-        .release = single_release
-};
-
 static struct cn_dev cdev = {
         .input   = cn_rx_skb,
 };
@@ -297,7 +284,7 @@ static int cn_init(void)
 
         cn_already_initialized = 1;
 
-        proc_create("connector", S_IRUGO, init_net.proc_net, &cn_file_ops);
+        proc_create_single("connector", S_IRUGO, init_net.proc_net, cn_proc_show);
 
         return 0;
 }
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index 32af6f063cb3..5f178384876f 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -1426,21 +1426,8 @@ static int idecd_capacity_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int idecd_capacity_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, idecd_capacity_proc_show, PDE_DATA(inode));
-}
-
-static const struct file_operations idecd_capacity_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = idecd_capacity_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static ide_proc_entry_t idecd_proc[] = {
-        { "capacity", S_IFREG|S_IRUGO, &idecd_capacity_proc_fops },
+        { "capacity", S_IFREG|S_IRUGO, idecd_capacity_proc_show },
         {}
 };
 
diff --git a/drivers/ide/ide-disk_proc.c b/drivers/ide/ide-disk_proc.c
index 82a36ced4e96..95d239b2f646 100644
--- a/drivers/ide/ide-disk_proc.c
+++ b/drivers/ide/ide-disk_proc.c
@@ -52,19 +52,6 @@ static int idedisk_cache_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int idedisk_cache_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, idedisk_cache_proc_show, PDE_DATA(inode));
-}
-
-static const struct file_operations idedisk_cache_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = idedisk_cache_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static int idedisk_capacity_proc_show(struct seq_file *m, void *v)
 {
         ide_drive_t*drive = (ide_drive_t *)m->private;
@@ -73,19 +60,6 @@ static int idedisk_capacity_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int idedisk_capacity_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, idedisk_capacity_proc_show, PDE_DATA(inode));
-}
-
-static const struct file_operations idedisk_capacity_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = idedisk_capacity_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static int __idedisk_proc_show(struct seq_file *m, ide_drive_t *drive, u8 sub_cmd)
 {
         u8 *buf;
@@ -114,43 +88,17 @@ static int idedisk_sv_proc_show(struct seq_file *m, void *v)
         return __idedisk_proc_show(m, m->private, ATA_SMART_READ_VALUES);
 }
 
-static int idedisk_sv_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, idedisk_sv_proc_show, PDE_DATA(inode));
-}
-
-static const struct file_operations idedisk_sv_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = idedisk_sv_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static int idedisk_st_proc_show(struct seq_file *m, void *v)
 {
         return __idedisk_proc_show(m, m->private, ATA_SMART_READ_THRESHOLDS);
 }
 
-static int idedisk_st_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, idedisk_st_proc_show, PDE_DATA(inode));
-}
-
-static const struct file_operations idedisk_st_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = idedisk_st_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 ide_proc_entry_t ide_disk_proc[] = {
-        { "cache",        S_IFREG|S_IRUGO, &idedisk_cache_proc_fops     },
-        { "capacity",     S_IFREG|S_IRUGO, &idedisk_capacity_proc_fops  },
-        { "geometry",     S_IFREG|S_IRUGO, &ide_geometry_proc_fops      },
-        { "smart_values", S_IFREG|S_IRUSR, &idedisk_sv_proc_fops        },
-        { "smart_thresholds", S_IFREG|S_IRUSR, &idedisk_st_proc_fops    },
+        { "cache",        S_IFREG|S_IRUGO, idedisk_cache_proc_show      },
+        { "capacity",     S_IFREG|S_IRUGO, idedisk_capacity_proc_show   },
+        { "geometry",     S_IFREG|S_IRUGO, ide_geometry_proc_show       },
+        { "smart_values", S_IFREG|S_IRUSR, idedisk_sv_proc_show         },
+        { "smart_thresholds", S_IFREG|S_IRUSR, idedisk_st_proc_show     },
         {}
 };
 
diff --git a/drivers/ide/ide-floppy_proc.c b/drivers/ide/ide-floppy_proc.c
index 471457ebea67..7f697ddb5fe5 100644
--- a/drivers/ide/ide-floppy_proc.c
+++ b/drivers/ide/ide-floppy_proc.c
@@ -14,22 +14,9 @@ static int idefloppy_capacity_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int idefloppy_capacity_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, idefloppy_capacity_proc_show, PDE_DATA(inode));
-}
-
-static const struct file_operations idefloppy_capacity_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = idefloppy_capacity_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 ide_proc_entry_t ide_floppy_proc[] = {
-        { "capacity",   S_IFREG|S_IRUGO, &idefloppy_capacity_proc_fops  },
-        { "geometry",   S_IFREG|S_IRUGO, &ide_geometry_proc_fops        },
+        { "capacity",   S_IFREG|S_IRUGO, idefloppy_capacity_proc_show   },
+        { "geometry",   S_IFREG|S_IRUGO, ide_geometry_proc_show         },
         {}
 };
 
diff --git a/drivers/ide/ide-proc.c b/drivers/ide/ide-proc.c
index 863db44c7916..45c997430332 100644
--- a/drivers/ide/ide-proc.c
+++ b/drivers/ide/ide-proc.c
@@ -56,19 +56,6 @@ static int ide_imodel_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int ide_imodel_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, ide_imodel_proc_show, PDE_DATA(inode));
-}
-
-static const struct file_operations ide_imodel_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = ide_imodel_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static int ide_mate_proc_show(struct seq_file *m, void *v)
 {
         ide_hwif_t      *hwif = (ide_hwif_t *) m->private;
@@ -80,19 +67,6 @@ static int ide_mate_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int ide_mate_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, ide_mate_proc_show, PDE_DATA(inode));
-}
-
-static const struct file_operations ide_mate_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = ide_mate_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static int ide_channel_proc_show(struct seq_file *m, void *v)
 {
         ide_hwif_t      *hwif = (ide_hwif_t *) m->private;
@@ -101,19 +75,6 @@ static int ide_channel_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int ide_channel_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, ide_channel_proc_show, PDE_DATA(inode));
-}
-
-static const struct file_operations ide_channel_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = ide_channel_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static int ide_identify_proc_show(struct seq_file *m, void *v)
 {
         ide_drive_t *drive = (ide_drive_t *)m->private;
@@ -141,19 +102,6 @@ static int ide_identify_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int ide_identify_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, ide_identify_proc_show, PDE_DATA(inode));
-}
-
-static const struct file_operations ide_identify_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = ide_identify_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 /**
  *      ide_find_setting        -       find a specific setting
  *      @st: setting table pointer
@@ -441,27 +389,14 @@ static const struct file_operations ide_settings_proc_fops = {
         .write          = ide_settings_proc_write,
 };
 
-static int ide_capacity_proc_show(struct seq_file *m, void *v)
+int ide_capacity_proc_show(struct seq_file *m, void *v)
 {
         seq_printf(m, "%llu\n", (long long)0x7fffffff);
         return 0;
 }
+EXPORT_SYMBOL_GPL(ide_capacity_proc_show);
 
-static int ide_capacity_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, ide_capacity_proc_show, NULL);
-}
-
-const struct file_operations ide_capacity_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = ide_capacity_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-EXPORT_SYMBOL_GPL(ide_capacity_proc_fops);
-
-static int ide_geometry_proc_show(struct seq_file *m, void *v)
+int ide_geometry_proc_show(struct seq_file *m, void *v)
 {
         ide_drive_t     *drive = (ide_drive_t *) m->private;
 
@@ -471,20 +406,7 @@ static int ide_geometry_proc_show(struct seq_file *m, void *v)
                         drive->bios_cyl, drive->bios_head, drive->bios_sect);
         return 0;
 }
-
-static int ide_geometry_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, ide_geometry_proc_show, PDE_DATA(inode));
-}
-
-const struct file_operations ide_geometry_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = ide_geometry_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-EXPORT_SYMBOL(ide_geometry_proc_fops);
+EXPORT_SYMBOL(ide_geometry_proc_show);
 
 static int ide_dmodel_proc_show(struct seq_file *seq, void *v)
 {
@@ -495,19 +417,6 @@ static int ide_dmodel_proc_show(struct seq_file *seq, void *v)
         return 0;
 }
 
-static int ide_dmodel_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, ide_dmodel_proc_show, PDE_DATA(inode));
-}
-
-static const struct file_operations ide_dmodel_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = ide_dmodel_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static int ide_driver_proc_show(struct seq_file *m, void *v)
 {
         ide_drive_t             *drive = (ide_drive_t *)m->private;
@@ -523,65 +432,6 @@ static int ide_driver_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int ide_driver_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, ide_driver_proc_show, PDE_DATA(inode));
-}
-
-static int ide_replace_subdriver(ide_drive_t *drive, const char *driver)
-{
-        struct device *dev = &drive->gendev;
-        int ret = 1;
-        int err;
-
-        device_release_driver(dev);
-        /* FIXME: device can still be in use by previous driver */
-        strlcpy(drive->driver_req, driver, sizeof(drive->driver_req));
-        err = device_attach(dev);
-        if (err < 0)
-                printk(KERN_WARNING "IDE: %s: device_attach error: %d\n",
-                        __func__, err);
-        drive->driver_req[0] = 0;
-        if (dev->driver == NULL) {
-                err = device_attach(dev);
-                if (err < 0)
-                        printk(KERN_WARNING
-                                "IDE: %s: device_attach(2) error: %d\n",
-                                __func__, err);
-        }
-        if (dev->driver && !strcmp(dev->driver->name, driver))
-                ret = 0;
-
-        return ret;
-}
-
-static ssize_t ide_driver_proc_write(struct file *file, const char __user *buffer,
-                                     size_t count, loff_t *pos)
-{
-        ide_drive_t     *drive = PDE_DATA(file_inode(file));
-        char name[32];
-
-        if (!capable(CAP_SYS_ADMIN))
-                return -EACCES;
-        if (count > 31)
-                count = 31;
-        if (copy_from_user(name, buffer, count))
-                return -EFAULT;
-        name[count] = '\0';
-        if (ide_replace_subdriver(drive, name))
-                return -EINVAL;
-        return count;
-}
-
-static const struct file_operations ide_driver_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = ide_driver_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-        .write          = ide_driver_proc_write,
-};
-
 static int ide_media_proc_show(struct seq_file *m, void *v)
 {
         ide_drive_t     *drive = (ide_drive_t *) m->private;
@@ -613,11 +463,10 @@ static const struct file_operations ide_media_proc_fops = {
 };
 
 static ide_proc_entry_t generic_drive_entries[] = {
-        { "driver",     S_IFREG|S_IRUGO,         &ide_driver_proc_fops  },
-        { "identify",   S_IFREG|S_IRUSR,         &ide_identify_proc_fops},
-        { "media",      S_IFREG|S_IRUGO,         &ide_media_proc_fops   },
-        { "model",      S_IFREG|S_IRUGO,         &ide_dmodel_proc_fops  },
-        { "settings",   S_IFREG|S_IRUSR|S_IWUSR, &ide_settings_proc_fops},
+        { "driver",     S_IFREG|S_IRUGO,         ide_driver_proc_show   },
+        { "identify",   S_IFREG|S_IRUSR,         ide_identify_proc_show },
+        { "media",      S_IFREG|S_IRUGO,         ide_media_proc_show    },
+        { "model",      S_IFREG|S_IRUGO,         ide_dmodel_proc_show   },
         {}
 };
 
@@ -628,7 +477,7 @@ static void ide_add_proc_entries(struct proc_dir_entry *dir, ide_proc_entry_t *p
         if (!dir || !p)
                 return;
         while (p->name != NULL) {
-                ent = proc_create_data(p->name, p->mode, dir, p->proc_fops, data);
+                ent = proc_create_single_data(p->name, p->mode, dir, p->show, data);
                 if (!ent) return;
                 p++;
         }
@@ -693,8 +542,12 @@ void ide_proc_port_register_devices(ide_hwif_t *hwif)
                         continue;
 
                 drive->proc = proc_mkdir(drive->name, parent);
-                if (drive->proc)
+                if (drive->proc) {
                         ide_add_proc_entries(drive->proc, generic_drive_entries, drive);
+                        proc_create_data("setting", S_IFREG|S_IRUSR|S_IWUSR,
+                                        drive->proc, &ide_settings_proc_fops,
+                                        drive);
+                }
                 sprintf(name, "ide%d/%s", (drive->name[2]-'a')/2, drive->name);
                 ent = proc_symlink(drive->name, proc_ide_root, name);
                 if (!ent) return;
@@ -704,6 +557,7 @@ void ide_proc_port_register_devices(ide_hwif_t *hwif)
 void ide_proc_unregister_device(ide_drive_t *drive)
 {
         if (drive->proc) {
+                remove_proc_entry("settings", drive->proc);
                 ide_remove_proc_entries(drive->proc, generic_drive_entries);
                 remove_proc_entry(drive->name, proc_ide_root);
                 remove_proc_entry(drive->name, drive->hwif->proc);
@@ -712,9 +566,9 @@ void ide_proc_unregister_device(ide_drive_t *drive)
 }
 
 static ide_proc_entry_t hwif_entries[] = {
-        { "channel",    S_IFREG|S_IRUGO,        &ide_channel_proc_fops  },
-        { "mate",       S_IFREG|S_IRUGO,        &ide_mate_proc_fops     },
-        { "model",      S_IFREG|S_IRUGO,        &ide_imodel_proc_fops   },
+        { "channel",    S_IFREG|S_IRUGO,        ide_channel_proc_show   },
+        { "mate",       S_IFREG|S_IRUGO,        ide_mate_proc_show      },
+        { "model",      S_IFREG|S_IRUGO,        ide_imodel_proc_show    },
         {}
 };
 
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
index 62c1a19a9aed..aee7b46d2330 100644
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -1847,22 +1847,9 @@ static int idetape_name_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int idetape_name_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, idetape_name_proc_show, PDE_DATA(inode));
-}
-
-static const struct file_operations idetape_name_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = idetape_name_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static ide_proc_entry_t idetape_proc[] = {
-        { "capacity",   S_IFREG|S_IRUGO,        &ide_capacity_proc_fops },
-        { "name",       S_IFREG|S_IRUGO,        &idetape_name_proc_fops },
+        { "capacity",   S_IFREG|S_IRUGO,        ide_capacity_proc_show  },
+        { "name",       S_IFREG|S_IRUGO,        idetape_name_proc_show  },
         {}
 };
 
diff --git a/drivers/input/misc/hp_sdc_rtc.c b/drivers/input/misc/hp_sdc_rtc.c
index 49b34de0aed4..47eb8ca729fe 100644
--- a/drivers/input/misc/hp_sdc_rtc.c
+++ b/drivers/input/misc/hp_sdc_rtc.c
@@ -509,18 +509,6 @@ static int hp_sdc_rtc_proc_show(struct seq_file *m, void *v)
 #undef NY
 }
 
-static int hp_sdc_rtc_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, hp_sdc_rtc_proc_show, NULL);
-}
-
-static const struct file_operations hp_sdc_rtc_proc_fops = {
-        .open           = hp_sdc_rtc_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static int hp_sdc_rtc_ioctl(struct file *file, 
                             unsigned int cmd, unsigned long arg)
 {
@@ -713,7 +701,7 @@ static int __init hp_sdc_rtc_init(void)
         if (misc_register(&hp_sdc_rtc_dev) != 0)
                 printk(KERN_INFO "Could not register misc. dev for i8042 rtc\n");
 
-        proc_create("driver/rtc", 0, NULL, &hp_sdc_rtc_proc_fops);
+        proc_create_single("driver/rtc", 0, NULL, hp_sdc_rtc_proc_show);
 
         printk(KERN_INFO "HP i8042 SDC + MSM-58321 RTC support loaded "
                          "(RTC v " RTC_VERSION ")\n");
diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
index 19cd93783c87..baa1ee2bc2ac 100644
--- 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)
diff --git a/drivers/isdn/capi/capidrv.c b/drivers/isdn/capi/capidrv.c
index 49fef08858c5..7ac51798949d 100644
--- a/drivers/isdn/capi/capidrv.c
+++ b/drivers/isdn/capi/capidrv.c
@@ -2460,22 +2460,9 @@ static int capidrv_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int capidrv_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, capidrv_proc_show, NULL);
-}
-
-static const struct file_operations capidrv_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = capidrv_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static void __init proc_init(void)
 {
-        proc_create("capi/capidrv", 0, NULL, &capidrv_proc_fops);
+        proc_create_single("capi/capidrv", 0, NULL, capidrv_proc_show);
 }
 
 static void __exit proc_exit(void)
diff --git a/drivers/isdn/capi/kcapi.c b/drivers/isdn/capi/kcapi.c
index 46c189ad8d94..0ff517d3c98f 100644
--- a/drivers/isdn/capi/kcapi.c
+++ b/drivers/isdn/capi/kcapi.c
@@ -534,7 +534,8 @@ int attach_capi_ctr(struct capi_ctr *ctr)
         init_waitqueue_head(&ctr->state_wait_queue);
 
         sprintf(ctr->procfn, "capi/controllers/%d", ctr->cnr);
-        ctr->procent = proc_create_data(ctr->procfn, 0, NULL, ctr->proc_fops, ctr);
+        ctr->procent = proc_create_single_data(ctr->procfn, 0, NULL,
+                        ctr->proc_show, ctr);
 
         ncontrollers++;
 
diff --git a/drivers/isdn/capi/kcapi_proc.c b/drivers/isdn/capi/kcapi_proc.c
index 68db3c5a1063..c94bd12c0f7c 100644
--- a/drivers/isdn/capi/kcapi_proc.c
+++ b/drivers/isdn/capi/kcapi_proc.c
@@ -108,32 +108,6 @@ static const struct seq_operations seq_contrstats_ops = {
         .show   = contrstats_show,
 };
 
-static int seq_controller_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &seq_controller_ops);
-}
-
-static int seq_contrstats_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &seq_contrstats_ops);
-}
-
-static const struct file_operations proc_controller_ops = {
-        .owner          = THIS_MODULE,
-        .open           = seq_controller_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release,
-};
-
-static const struct file_operations proc_contrstats_ops = {
-        .owner          = THIS_MODULE,
-        .open           = seq_contrstats_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release,
-};
-
 // /proc/capi/applications:
 //      applid l3cnt dblkcnt dblklen #ncci recvqueuelen
 // /proc/capi/applstats:
@@ -216,34 +190,6 @@ static const struct seq_operations seq_applstats_ops = {
         .show   = applstats_show,
 };
 
-static int
-seq_applications_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &seq_applications_ops);
-}
-
-static int
-seq_applstats_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &seq_applstats_ops);
-}
-
-static const struct file_operations proc_applications_ops = {
-        .owner          = THIS_MODULE,
-        .open           = seq_applications_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release,
-};
-
-static const struct file_operations proc_applstats_ops = {
-        .owner          = THIS_MODULE,
-        .open           = seq_applstats_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release,
-};
-
 // ---------------------------------------------------------------------------
 
 static void *capi_driver_start(struct seq_file *seq, loff_t *pos)
@@ -279,22 +225,6 @@ static const struct seq_operations seq_capi_driver_ops = {
         .show   = capi_driver_show,
 };
 
-static int
-seq_capi_driver_open(struct inode *inode, struct file *file)
-{
-        int err;
-        err = seq_open(file, &seq_capi_driver_ops);
-        return err;
-}
-
-static const struct file_operations proc_driver_ops = {
-        .owner          = THIS_MODULE,
-        .open           = seq_capi_driver_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release,
-};
-
 // ---------------------------------------------------------------------------
 
 void __init
@@ -302,11 +232,11 @@ kcapi_proc_init(void)
 {
         proc_mkdir("capi",             NULL);
         proc_mkdir("capi/controllers", NULL);
-        proc_create("capi/controller",   0, NULL, &proc_controller_ops);
-        proc_create("capi/contrstats",   0, NULL, &proc_contrstats_ops);
-        proc_create("capi/applications", 0, NULL, &proc_applications_ops);
-        proc_create("capi/applstats",    0, NULL, &proc_applstats_ops);
-        proc_create("capi/driver",       0, NULL, &proc_driver_ops);
+        proc_create_seq("capi/controller",   0, NULL, &seq_controller_ops);
+        proc_create_seq("capi/contrstats",   0, NULL, &seq_contrstats_ops);
+        proc_create_seq("capi/applications", 0, NULL, &seq_applications_ops);
+        proc_create_seq("capi/applstats",    0, NULL, &seq_applstats_ops);
+        proc_create_seq("capi/driver",       0, NULL, &seq_capi_driver_ops);
 }
 
 void __exit
diff --git a/drivers/isdn/gigaset/capi.c b/drivers/isdn/gigaset/capi.c
index ccec7778cad2..56748af78c04 100644
--- a/drivers/isdn/gigaset/capi.c
+++ b/drivers/isdn/gigaset/capi.c
@@ -2437,19 +2437,6 @@ static int gigaset_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int gigaset_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, gigaset_proc_show, PDE_DATA(inode));
-}
-
-static const struct file_operations gigaset_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = gigaset_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 /**
  * gigaset_isdn_regdev() - register device to LL
  * @cs:         device descriptor structure.
@@ -2479,7 +2466,7 @@ int gigaset_isdn_regdev(struct cardstate *cs, const char *isdnid)
         iif->ctr.release_appl  = gigaset_release_appl;
         iif->ctr.send_message  = gigaset_send_message;
         iif->ctr.procinfo      = gigaset_procinfo;
-        iif->ctr.proc_fops = &gigaset_proc_fops;
+        iif->ctr.proc_show     = gigaset_proc_show,
         INIT_LIST_HEAD(&iif->appls);
         skb_queue_head_init(&iif->sendqueue);
         atomic_set(&iif->sendqlen, 0);
diff --git a/drivers/isdn/hardware/avm/avmcard.h b/drivers/isdn/hardware/avm/avmcard.h
index c95712dbfa9f..cdfa89c71997 100644
--- a/drivers/isdn/hardware/avm/avmcard.h
+++ b/drivers/isdn/hardware/avm/avmcard.h
@@ -556,7 +556,7 @@ u16  b1_send_message(struct capi_ctr *ctrl, struct sk_buff *skb);
 void b1_parse_version(avmctrl_info *card);
 irqreturn_t b1_interrupt(int interrupt, void *devptr);
 
-extern const struct file_operations b1ctl_proc_fops;
+int b1_proc_show(struct seq_file *m, void *v);
 
 avmcard_dmainfo *avmcard_dma_alloc(char *name, struct pci_dev *,
                                    long rsize, long ssize);
@@ -576,6 +576,6 @@ void b1dma_register_appl(struct capi_ctr *ctrl,
                          capi_register_params *rp);
 void b1dma_release_appl(struct capi_ctr *ctrl, u16 appl);
 u16  b1dma_send_message(struct capi_ctr *ctrl, struct sk_buff *skb);
-extern const struct file_operations b1dmactl_proc_fops;
+int b1dma_proc_show(struct seq_file *m, void *v);
 
 #endif /* _AVMCARD_H_ */
diff --git a/drivers/isdn/hardware/avm/b1.c b/drivers/isdn/hardware/avm/b1.c
index b1833d08a5fe..5ee5489d3f15 100644
--- a/drivers/isdn/hardware/avm/b1.c
+++ b/drivers/isdn/hardware/avm/b1.c
@@ -637,7 +637,7 @@ irqreturn_t b1_interrupt(int interrupt, void *devptr)
 }
 
 /* ------------------------------------------------------------- */
-static int b1ctl_proc_show(struct seq_file *m, void *v)
+int b1_proc_show(struct seq_file *m, void *v)
 {
         struct capi_ctr *ctrl = m->private;
         avmctrl_info *cinfo = (avmctrl_info *)(ctrl->driverdata);
@@ -699,20 +699,7 @@ static int b1ctl_proc_show(struct seq_file *m, void *v)
 
         return 0;
 }
-
-static int b1ctl_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, b1ctl_proc_show, PDE_DATA(inode));
-}
-
-const struct file_operations b1ctl_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = b1ctl_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-EXPORT_SYMBOL(b1ctl_proc_fops);
+EXPORT_SYMBOL(b1_proc_show);
 
 /* ------------------------------------------------------------- */
 
diff --git a/drivers/isdn/hardware/avm/b1dma.c b/drivers/isdn/hardware/avm/b1dma.c
index 9538a9e5e1a8..6a3dc9937ce5 100644
--- a/drivers/isdn/hardware/avm/b1dma.c
+++ b/drivers/isdn/hardware/avm/b1dma.c
@@ -858,7 +858,7 @@ u16 b1dma_send_message(struct capi_ctr *ctrl, struct sk_buff *skb)
 
 /* ------------------------------------------------------------- */
 
-static int b1dmactl_proc_show(struct seq_file *m, void *v)
+int b1dma_proc_show(struct seq_file *m, void *v)
 {
         struct capi_ctr *ctrl = m->private;
         avmctrl_info *cinfo = (avmctrl_info *)(ctrl->driverdata);
@@ -941,20 +941,7 @@ static int b1dmactl_proc_show(struct seq_file *m, void *v)
 
         return 0;
 }
-
-static int b1dmactl_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, b1dmactl_proc_show, PDE_DATA(inode));
-}
-
-const struct file_operations b1dmactl_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = b1dmactl_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-EXPORT_SYMBOL(b1dmactl_proc_fops);
+EXPORT_SYMBOL(b1dma_proc_show);
 
 /* ------------------------------------------------------------- */
 
diff --git a/drivers/isdn/hardware/avm/b1isa.c b/drivers/isdn/hardware/avm/b1isa.c
index 54e871a47387..cdfea72e0ef6 100644
--- a/drivers/isdn/hardware/avm/b1isa.c
+++ b/drivers/isdn/hardware/avm/b1isa.c
@@ -121,7 +121,7 @@ static int b1isa_probe(struct pci_dev *pdev)
         cinfo->capi_ctrl.load_firmware = b1_load_firmware;
         cinfo->capi_ctrl.reset_ctr     = b1_reset_ctr;
         cinfo->capi_ctrl.procinfo      = b1isa_procinfo;
-        cinfo->capi_ctrl.proc_fops = &b1ctl_proc_fops;
+        cinfo->capi_ctrl.proc_show     = b1_proc_show;
         strcpy(cinfo->capi_ctrl.name, card->name);
 
         retval = attach_capi_ctr(&cinfo->capi_ctrl);
diff --git a/drivers/isdn/hardware/avm/b1pci.c b/drivers/isdn/hardware/avm/b1pci.c
index ac4863c2ecbc..b76b57a82c02 100644
--- a/drivers/isdn/hardware/avm/b1pci.c
+++ b/drivers/isdn/hardware/avm/b1pci.c
@@ -112,7 +112,7 @@ static int b1pci_probe(struct capicardparams *p, struct pci_dev *pdev)
         cinfo->capi_ctrl.load_firmware = b1_load_firmware;
         cinfo->capi_ctrl.reset_ctr     = b1_reset_ctr;
         cinfo->capi_ctrl.procinfo      = b1pci_procinfo;
-        cinfo->capi_ctrl.proc_fops = &b1ctl_proc_fops;
+        cinfo->capi_ctrl.proc_show     = b1_proc_show;
         strcpy(cinfo->capi_ctrl.name, card->name);
         cinfo->capi_ctrl.owner         = THIS_MODULE;
 
@@ -251,7 +251,7 @@ static int b1pciv4_probe(struct capicardparams *p, struct pci_dev *pdev)
         cinfo->capi_ctrl.load_firmware = b1dma_load_firmware;
         cinfo->capi_ctrl.reset_ctr     = b1dma_reset_ctr;
         cinfo->capi_ctrl.procinfo      = b1pciv4_procinfo;
-        cinfo->capi_ctrl.proc_fops = &b1dmactl_proc_fops;
+        cinfo->capi_ctrl.proc_show     = b1dma_proc_show;
         strcpy(cinfo->capi_ctrl.name, card->name);
 
         retval = attach_capi_ctr(&cinfo->capi_ctrl);
diff --git a/drivers/isdn/hardware/avm/b1pcmcia.c b/drivers/isdn/hardware/avm/b1pcmcia.c
index 6b0d19d963d5..3aca16e62902 100644
--- a/drivers/isdn/hardware/avm/b1pcmcia.c
+++ b/drivers/isdn/hardware/avm/b1pcmcia.c
@@ -108,7 +108,7 @@ static int b1pcmcia_add_card(unsigned int port, unsigned irq,
         cinfo->capi_ctrl.load_firmware = b1_load_firmware;
         cinfo->capi_ctrl.reset_ctr     = b1_reset_ctr;
         cinfo->capi_ctrl.procinfo      = b1pcmcia_procinfo;
-        cinfo->capi_ctrl.proc_fops = &b1ctl_proc_fops;
+        cinfo->capi_ctrl.proc_show     = b1_proc_show;
         strcpy(cinfo->capi_ctrl.name, card->name);
 
         retval = attach_capi_ctr(&cinfo->capi_ctrl);
diff --git a/drivers/isdn/hardware/avm/c4.c b/drivers/isdn/hardware/avm/c4.c
index 034cabac699d..ac72cd204c4d 100644
--- a/drivers/isdn/hardware/avm/c4.c
+++ b/drivers/isdn/hardware/avm/c4.c
@@ -1127,19 +1127,6 @@ static int c4_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int c4_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, c4_proc_show, PDE_DATA(inode));
-}
-
-static const struct file_operations c4_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = c4_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 /* ------------------------------------------------------------- */
 
 static int c4_add_card(struct capicardparams *p, struct pci_dev *dev,
@@ -1211,7 +1198,7 @@ static int c4_add_card(struct capicardparams *p, struct pci_dev *dev,
                 cinfo->capi_ctrl.load_firmware = c4_load_firmware;
                 cinfo->capi_ctrl.reset_ctr     = c4_reset_ctr;
                 cinfo->capi_ctrl.procinfo      = c4_procinfo;
-                cinfo->capi_ctrl.proc_fops = &c4_proc_fops;
+                cinfo->capi_ctrl.proc_show     = c4_proc_show;
                 strcpy(cinfo->capi_ctrl.name, card->name);
 
                 retval = attach_capi_ctr(&cinfo->capi_ctrl);
diff --git a/drivers/isdn/hardware/avm/t1isa.c b/drivers/isdn/hardware/avm/t1isa.c
index 9f80d20ced87..2153619c5b31 100644
--- a/drivers/isdn/hardware/avm/t1isa.c
+++ b/drivers/isdn/hardware/avm/t1isa.c
@@ -430,7 +430,7 @@ static int t1isa_probe(struct pci_dev *pdev, int cardnr)
         cinfo->capi_ctrl.load_firmware = t1isa_load_firmware;
         cinfo->capi_ctrl.reset_ctr     = t1isa_reset_ctr;
         cinfo->capi_ctrl.procinfo      = t1isa_procinfo;
-        cinfo->capi_ctrl.proc_fops = &b1ctl_proc_fops;
+        cinfo->capi_ctrl.proc_show     = b1_proc_show;
         strcpy(cinfo->capi_ctrl.name, card->name);
 
         retval = attach_capi_ctr(&cinfo->capi_ctrl);
diff --git a/drivers/isdn/hardware/avm/t1pci.c b/drivers/isdn/hardware/avm/t1pci.c
index 2180b1685691..f5ed1d5004c9 100644
--- a/drivers/isdn/hardware/avm/t1pci.c
+++ b/drivers/isdn/hardware/avm/t1pci.c
@@ -119,7 +119,7 @@ static int t1pci_add_card(struct capicardparams *p, struct pci_dev *pdev)
         cinfo->capi_ctrl.load_firmware = b1dma_load_firmware;
         cinfo->capi_ctrl.reset_ctr     = b1dma_reset_ctr;
         cinfo->capi_ctrl.procinfo      = t1pci_procinfo;
-        cinfo->capi_ctrl.proc_fops = &b1dmactl_proc_fops;
+        cinfo->capi_ctrl.proc_show     = b1dma_proc_show;
         strcpy(cinfo->capi_ctrl.name, card->name);
 
         retval = attach_capi_ctr(&cinfo->capi_ctrl);
diff --git a/drivers/isdn/hardware/eicon/capimain.c b/drivers/isdn/hardware/eicon/capimain.c
index be36d82004d6..f9244dc1c3c9 100644
--- a/drivers/isdn/hardware/eicon/capimain.c
+++ b/drivers/isdn/hardware/eicon/capimain.c
@@ -90,19 +90,6 @@ static int diva_ctl_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int diva_ctl_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, diva_ctl_proc_show, NULL);
-}
-
-static const struct file_operations diva_ctl_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = diva_ctl_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 /*
  * set additional os settings in capi_ctr struct
  */
@@ -111,7 +98,7 @@ void diva_os_set_controller_struct(struct capi_ctr *ctrl)
         ctrl->driver_name = DRIVERLNAME;
         ctrl->load_firmware = NULL;
         ctrl->reset_ctr = NULL;
-        ctrl->proc_fops = &diva_ctl_proc_fops;
+        ctrl->proc_show = diva_ctl_proc_show;
         ctrl->owner = THIS_MODULE;
 }
 
diff --git a/drivers/isdn/hardware/eicon/diva_didd.c b/drivers/isdn/hardware/eicon/diva_didd.c
index fab6ccfb00d5..60e79257dd5f 100644
--- a/drivers/isdn/hardware/eicon/diva_didd.c
+++ b/drivers/isdn/hardware/eicon/diva_didd.c
@@ -78,26 +78,13 @@ static int divadidd_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int divadidd_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, divadidd_proc_show, NULL);
-}
-
-static const struct file_operations divadidd_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = divadidd_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static int __init create_proc(void)
 {
         proc_net_eicon = proc_mkdir("eicon", init_net.proc_net);
 
         if (proc_net_eicon) {
-                proc_didd = proc_create(DRIVERLNAME, S_IRUGO, proc_net_eicon,
-                                        &divadidd_proc_fops);
+                proc_didd = proc_create_single(DRIVERLNAME, S_IRUGO,
+                                proc_net_eicon, divadidd_proc_show);
                 return (1);
         }
         return (0);
diff --git a/drivers/isdn/hardware/eicon/divasi.c b/drivers/isdn/hardware/eicon/divasi.c
index 525518c945fe..e7081e0c0e35 100644
--- a/drivers/isdn/hardware/eicon/divasi.c
+++ b/drivers/isdn/hardware/eicon/divasi.c
@@ -101,23 +101,10 @@ static int um_idi_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int um_idi_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, um_idi_proc_show, NULL);
-}
-
-static const struct file_operations um_idi_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = um_idi_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static int __init create_um_idi_proc(void)
 {
-        um_idi_proc_entry = proc_create(DRIVERLNAME, S_IRUGO, proc_net_eicon,
-                                        &um_idi_proc_fops);
+        um_idi_proc_entry = proc_create_single(DRIVERLNAME, S_IRUGO,
+                        proc_net_eicon, um_idi_proc_show);
         if (!um_idi_proc_entry)
                 return (0);
         return (1);
diff --git a/drivers/isdn/hysdn/hycapi.c b/drivers/isdn/hysdn/hycapi.c
index eac0f51a0f60..a2c15cd7bf67 100644
--- a/drivers/isdn/hysdn/hycapi.c
+++ b/drivers/isdn/hysdn/hycapi.c
@@ -467,19 +467,6 @@ static int hycapi_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int hycapi_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, hycapi_proc_show, PDE_DATA(inode));
-}
-
-static const struct file_operations hycapi_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = hycapi_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 /**************************************************************
 hycapi_load_firmware
 
@@ -774,7 +761,7 @@ hycapi_capi_create(hysdn_card *card)
                 ctrl->load_firmware = hycapi_load_firmware;
                 ctrl->reset_ctr     = hycapi_reset_ctr;
                 ctrl->procinfo      = hycapi_procinfo;
-                ctrl->proc_fops = &hycapi_proc_fops;
+                ctrl->proc_show     = hycapi_proc_show;
                 strcpy(ctrl->name, cinfo->cardname);
                 ctrl->owner = THIS_MODULE;
 
diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
index 433dbeddfcf9..6663893f41c4 100644
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
@@ -191,10 +191,10 @@ static int init_pmu(void);
 static void pmu_start(void);
 static irqreturn_t via_pmu_interrupt(int irq, void *arg);
 static irqreturn_t gpio1_interrupt(int irq, void *arg);
-static const struct file_operations pmu_info_proc_fops;
-static const struct file_operations pmu_irqstats_proc_fops;
+static int pmu_info_proc_show(struct seq_file *m, void *v);
+static int pmu_irqstats_proc_show(struct seq_file *m, void *v);
+static int pmu_battery_proc_show(struct seq_file *m, void *v);
 static void pmu_pass_intr(unsigned char *data, int len);
-static const struct file_operations pmu_battery_proc_fops;
 static const struct file_operations pmu_options_proc_fops;
 
 #ifdef CONFIG_ADB
@@ -511,13 +511,15 @@ static int __init via_pmu_dev_init(void)
                 for (i=0; i<pmu_battery_count; i++) {
                         char title[16];
                         sprintf(title, "battery_%ld", i);
-                        proc_pmu_batt[i] = proc_create_data(title, 0, proc_pmu_root,
-                                        &pmu_battery_proc_fops, (void *)i);
+                        proc_pmu_batt[i] = proc_create_single_data(title, 0,
+                                        proc_pmu_root, pmu_battery_proc_show,
+                                        (void *)i);
                 }
 
-                proc_pmu_info = proc_create("info", 0, proc_pmu_root, &pmu_info_proc_fops);
-                proc_pmu_irqstats = proc_create("interrupts", 0, proc_pmu_root,
-                                                &pmu_irqstats_proc_fops);
+                proc_pmu_info = proc_create_single("info", 0, proc_pmu_root,
+                                pmu_info_proc_show);
+                proc_pmu_irqstats = proc_create_single("interrupts", 0,
+                                proc_pmu_root, pmu_irqstats_proc_show);
                 proc_pmu_options = proc_create("options", 0600, proc_pmu_root,
                                                 &pmu_options_proc_fops);
         }
@@ -811,19 +813,6 @@ static int pmu_info_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int pmu_info_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, pmu_info_proc_show, NULL);
-}
-
-static const struct file_operations pmu_info_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = pmu_info_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static int pmu_irqstats_proc_show(struct seq_file *m, void *v)
 {
         int i;
@@ -848,19 +837,6 @@ static int pmu_irqstats_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int pmu_irqstats_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, pmu_irqstats_proc_show, NULL);
-}
-
-static const struct file_operations pmu_irqstats_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = pmu_irqstats_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static int pmu_battery_proc_show(struct seq_file *m, void *v)
 {
         long batnum = (long)m->private;
@@ -875,19 +851,6 @@ static int pmu_battery_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int pmu_battery_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, pmu_battery_proc_show, PDE_DATA(inode));
-}
-
-static const struct file_operations pmu_battery_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = pmu_battery_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static int pmu_options_proc_show(struct seq_file *m, void *v)
 {
 #if defined(CONFIG_SUSPEND) && defined(CONFIG_PPC32)
diff --git a/drivers/media/pci/saa7164/saa7164-core.c b/drivers/media/pci/saa7164/saa7164-core.c
index fca36a4910c2..d697e1ad929c 100644
--- a/drivers/media/pci/saa7164/saa7164-core.c
+++ b/drivers/media/pci/saa7164/saa7164-core.c
@@ -1122,23 +1122,11 @@ static int saa7164_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int saa7164_proc_open(struct inode *inode, struct file *filp)
-{
-        return single_open(filp, saa7164_proc_show, NULL);
-}
-
-static const struct file_operations saa7164_proc_fops = {
-        .open           = saa7164_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static int saa7164_proc_create(void)
 {
         struct proc_dir_entry *pe;
 
-        pe = proc_create("saa7164", S_IRUGO, NULL, &saa7164_proc_fops);
+        pe = proc_create_single("saa7164", S_IRUGO, NULL, saa7164_proc_show);
         if (!pe)
                 return -ENOMEM;
 
diff --git a/drivers/media/pci/zoran/videocodec.c b/drivers/media/pci/zoran/videocodec.c
index 5ff23ef89215..4427ae7126e2 100644
--- a/drivers/media/pci/zoran/videocodec.c
+++ b/drivers/media/pci/zoran/videocodec.c
@@ -344,19 +344,6 @@ static int proc_videocodecs_show(struct seq_file *m, void *v)
 
         return 0;
 }
-
-static int proc_videocodecs_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, proc_videocodecs_show, NULL);
-}
-
-static const struct file_operations videocodecs_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = proc_videocodecs_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
 #endif
 
 /* ===================== */
@@ -373,7 +360,8 @@ videocodec_init (void)
                VIDEOCODEC_VERSION);
 
 #ifdef CONFIG_PROC_FS
-        videocodec_proc_entry = proc_create("videocodecs", 0, NULL, &videocodecs_proc_fops);
+        videocodec_proc_entry = proc_create_single("videocodecs", 0, NULL,
+                        proc_videocodecs_show);
         if (!videocodec_proc_entry) {
                 dprintk(1, KERN_ERR "videocodec: can't init procfs.\n");
         }
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index 51eb1b027963..a746ccdd630a 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -197,9 +197,9 @@ static int	mpt_host_page_access_control(MPT_ADAPTER *ioc, u8 access_control_valu
 static int      mpt_host_page_alloc(MPT_ADAPTER *ioc, pIOCInit_t ioc_init);
 
 #ifdef CONFIG_PROC_FS
-static const struct file_operations mpt_summary_proc_fops;
-static const struct file_operations mpt_version_proc_fops;
-static const struct file_operations mpt_iocinfo_proc_fops;
+static int mpt_summary_proc_show(struct seq_file *m, void *v);
+static int mpt_version_proc_show(struct seq_file *m, void *v);
+static int mpt_iocinfo_proc_show(struct seq_file *m, void *v);
 #endif
 static void     mpt_get_fw_exp_ver(char *buf, MPT_ADAPTER *ioc);
 
@@ -2040,8 +2040,10 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
          */
         dent = proc_mkdir(ioc->name, mpt_proc_root_dir);
         if (dent) {
-                proc_create_data("info", S_IRUGO, dent, &mpt_iocinfo_proc_fops, ioc);
-                proc_create_data("summary", S_IRUGO, dent, &mpt_summary_proc_fops, ioc);
+                proc_create_single_data("info", S_IRUGO, dent,
+                                mpt_iocinfo_proc_show, ioc);
+                proc_create_single_data("summary", S_IRUGO, dent,
+                                mpt_summary_proc_show, ioc);
         }
 #endif
 
@@ -6606,8 +6608,10 @@ procmpt_create(void)
         if (mpt_proc_root_dir == NULL)
                 return -ENOTDIR;
 
-        proc_create("summary", S_IRUGO, mpt_proc_root_dir, &mpt_summary_proc_fops);
-        proc_create("version", S_IRUGO, mpt_proc_root_dir, &mpt_version_proc_fops);
+        proc_create_single("summary", S_IRUGO, mpt_proc_root_dir,
+                        mpt_summary_proc_show);
+        proc_create_single("version", S_IRUGO, mpt_proc_root_dir,
+                        mpt_version_proc_show);
         return 0;
 }
 
@@ -6646,19 +6650,6 @@ static int mpt_summary_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int mpt_summary_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, mpt_summary_proc_show, PDE_DATA(inode));
-}
-
-static const struct file_operations mpt_summary_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = mpt_summary_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static int mpt_version_proc_show(struct seq_file *m, void *v)
 {
         u8       cb_idx;
@@ -6701,19 +6692,6 @@ static int mpt_version_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int mpt_version_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, mpt_version_proc_show, NULL);
-}
-
-static const struct file_operations mpt_version_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = mpt_version_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
 {
         MPT_ADAPTER     *ioc = m->private;
@@ -6793,19 +6771,6 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
 
         return 0;
 }
-
-static int mpt_iocinfo_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, mpt_iocinfo_proc_show, PDE_DATA(inode));
-}
-
-static const struct file_operations mpt_iocinfo_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = mpt_iocinfo_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
 #endif          /* CONFIG_PROC_FS } */
 
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
diff --git a/drivers/misc/sgi-gru/gruprocfs.c b/drivers/misc/sgi-gru/gruprocfs.c
index 4f7635922394..42ea2eccaee9 100644
--- a/drivers/misc/sgi-gru/gruprocfs.c
+++ b/drivers/misc/sgi-gru/gruprocfs.c
@@ -270,16 +270,6 @@ static int options_open(struct inode *inode, struct file *file)
         return single_open(file, options_show, NULL);
 }
 
-static int cch_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &cch_seq_ops);
-}
-
-static int gru_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &gru_seq_ops);
-}
-
 /* *INDENT-OFF* */
 static const struct file_operations statistics_fops = {
         .open           = statistics_open,
@@ -305,73 +295,30 @@ static const struct file_operations options_fops = {
         .release        = single_release,
 };
 
-static const struct file_operations cch_fops = {
-        .open           = cch_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release,
-};
-static const struct file_operations gru_fops = {
-        .open           = gru_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release,
-};
-
-static struct proc_entry {
-        char *name;
-        umode_t mode;
-        const struct file_operations *fops;
-        struct proc_dir_entry *entry;
-} proc_files[] = {
-        {"statistics", 0644, &statistics_fops},
-        {"mcs_statistics", 0644, &mcs_statistics_fops},
-        {"debug_options", 0644, &options_fops},
-        {"cch_status", 0444, &cch_fops},
-        {"gru_status", 0444, &gru_fops},
-        {NULL}
-};
-/* *INDENT-ON* */
-
 static struct proc_dir_entry *proc_gru __read_mostly;
 
-static int create_proc_file(struct proc_entry *p)
-{
-        p->entry = proc_create(p->name, p->mode, proc_gru, p->fops);
-        if (!p->entry)
-                return -1;
-        return 0;
-}
-
-static void delete_proc_files(void)
-{
-        struct proc_entry *p;
-
-        if (proc_gru) {
-                for (p = proc_files; p->name; p++)
-                        if (p->entry)
-                                remove_proc_entry(p->name, proc_gru);
-                proc_remove(proc_gru);
-        }
-}
-
 int gru_proc_init(void)
 {
-        struct proc_entry *p;
-
         proc_gru = proc_mkdir("sgi_uv/gru", NULL);
-
-        for (p = proc_files; p->name; p++)
-                if (create_proc_file(p))
-                        goto err;
+        if (!proc_gru)
+                return -1;
+        if (!proc_create("statistics", 0644, proc_gru, &statistics_fops))
+                goto err;
+        if (!proc_create("mcs_statistics", 0644, proc_gru, &mcs_statistics_fops))
+                goto err;
+        if (!proc_create("debug_options", 0644, proc_gru, &options_fops))
+                goto err;
+        if (!proc_create_seq("cch_status", 0444, proc_gru, &cch_seq_ops))
+                goto err;
+        if (!proc_create_seq("gru_status", 0444, proc_gru, &gru_seq_ops))
+                goto err;
         return 0;
-
 err:
-        delete_proc_files();
+        remove_proc_subtree("sgi_uv/gru", NULL);
         return -1;
 }
 
 void gru_proc_exit(void)
 {
-        delete_proc_files();
+        remove_proc_subtree("sgi_uv/gru", NULL);
 }
diff --git a/drivers/mmc/core/sdio_uart.c b/drivers/mmc/core/sdio_uart.c
index d3c91f412b69..25e113001a3c 100644
--- a/drivers/mmc/core/sdio_uart.c
+++ b/drivers/mmc/core/sdio_uart.c
@@ -1008,19 +1008,6 @@ static int sdio_uart_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int sdio_uart_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, sdio_uart_proc_show, NULL);
-}
-
-static const struct file_operations sdio_uart_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = sdio_uart_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static const struct tty_port_operations sdio_uart_port_ops = {
         .dtr_rts = uart_dtr_rts,
         .carrier_raised = uart_carrier_raised,
@@ -1045,7 +1032,7 @@ static const struct tty_operations sdio_uart_ops = {
         .tiocmset               = sdio_uart_tiocmset,
         .install                = sdio_uart_install,
         .cleanup                = sdio_uart_cleanup,
-        .proc_fops              = &sdio_uart_proc_fops,
+        .proc_show              = sdio_uart_proc_show,
 };
 
 static struct tty_driver *sdio_uart_tty_driver;
diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
index 807d17d863b3..64a1fcaafd9a 100644
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
@@ -1829,18 +1829,6 @@ static int mtd_proc_show(struct seq_file *m, void *v)
         mutex_unlock(&mtd_table_mutex);
         return 0;
 }
-
-static int mtd_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, mtd_proc_show, NULL);
-}
-
-static const struct file_operations mtd_proc_ops = {
-        .open           = mtd_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
 #endif /* CONFIG_PROC_FS */
 
 /*====================================================================*/
@@ -1883,7 +1871,7 @@ static int __init init_mtd(void)
                 goto err_bdi;
         }
 
-        proc_mtd = proc_create("mtd", 0, NULL, &mtd_proc_ops);
+        proc_mtd = proc_create_single("mtd", 0, NULL, mtd_proc_show);
 
         ret = init_mtdchar();
         if (ret)
diff --git a/drivers/net/bonding/bond_procfs.c b/drivers/net/bonding/bond_procfs.c
index 01059f1a7bca..9f7d83e827c3 100644
--- a/drivers/net/bonding/bond_procfs.c
+++ b/drivers/net/bonding/bond_procfs.c
@@ -10,7 +10,7 @@
 static void *bond_info_seq_start(struct seq_file *seq, loff_t *pos)
         __acquires(RCU)
 {
-        struct bonding *bond = seq->private;
+        struct bonding *bond = PDE_DATA(file_inode(seq->file));
         struct list_head *iter;
         struct slave *slave;
         loff_t off = 0;
@@ -29,7 +29,7 @@ static void *bond_info_seq_start(struct seq_file *seq, loff_t *pos)
 
 static void *bond_info_seq_next(struct seq_file *seq, void *v, loff_t *pos)
 {
-        struct bonding *bond = seq->private;
+        struct bonding *bond = PDE_DATA(file_inode(seq->file));
         struct list_head *iter;
         struct slave *slave;
         bool found = false;
@@ -56,7 +56,7 @@ static void bond_info_seq_stop(struct seq_file *seq, void *v)
 
 static void bond_info_show_master(struct seq_file *seq)
 {
-        struct bonding *bond = seq->private;
+        struct bonding *bond = PDE_DATA(file_inode(seq->file));
         const struct bond_opt_value *optval;
         struct slave *curr, *primary;
         int i;
@@ -167,7 +167,7 @@ static void bond_info_show_master(struct seq_file *seq)
 static void bond_info_show_slave(struct seq_file *seq,
                                  const struct slave *slave)
 {
-        struct bonding *bond = seq->private;
+        struct bonding *bond = PDE_DATA(file_inode(seq->file));
 
         seq_printf(seq, "\nSlave Interface: %s\n", slave->dev->name);
         seq_printf(seq, "MII Status: %s\n", bond_slave_link_status(slave->link));
@@ -257,38 +257,14 @@ static const struct seq_operations bond_info_seq_ops = {
         .show  = bond_info_seq_show,
 };
 
-static int bond_info_open(struct inode *inode, struct file *file)
-{
-        struct seq_file *seq;
-        int res;
-
-        res = seq_open(file, &bond_info_seq_ops);
-        if (!res) {
-                /* recover the pointer buried in proc_dir_entry data */
-                seq = file->private_data;
-                seq->private = PDE_DATA(inode);
-        }
-
-        return res;
-}
-
-static const struct file_operations bond_info_fops = {
-        .owner   = THIS_MODULE,
-        .open    = bond_info_open,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
-        .release = seq_release,
-};
-
 void bond_create_proc_entry(struct bonding *bond)
 {
         struct net_device *bond_dev = bond->dev;
         struct bond_net *bn = net_generic(dev_net(bond_dev), bond_net_id);
 
         if (bn->proc_dir) {
-                bond->proc_entry = proc_create_data(bond_dev->name,
-                                                    0444, bn->proc_dir,
-                                                    &bond_info_fops, bond);
+                bond->proc_entry = proc_create_seq_data(bond_dev->name, 0444,
+                                bn->proc_dir, &bond_info_seq_ops, bond);
                 if (bond->proc_entry == NULL)
                         netdev_warn(bond_dev, "Cannot create /proc/net/%s/%s\n",
                                     DRV_NAME, bond_dev->name);
diff --git a/drivers/net/hamradio/bpqether.c b/drivers/net/hamradio/bpqether.c
index dfabbae72efd..f347fd9c5b28 100644
--- a/drivers/net/hamradio/bpqether.c
+++ b/drivers/net/hamradio/bpqether.c
@@ -449,20 +449,6 @@ static const struct seq_operations bpq_seqops = {
         .show = bpq_seq_show,
 };
 
-static int bpq_info_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &bpq_seqops);
-}
-
-static const struct file_operations bpq_info_fops = {
-        .owner = THIS_MODULE,
-        .open = bpq_info_open,
-        .read = seq_read,
-        .llseek = seq_lseek,
-        .release = seq_release,
-};
-
-
 /* ------------------------------------------------------------------------ */
 
 static const struct net_device_ops bpq_netdev_ops = {
@@ -590,7 +576,7 @@ static int bpq_device_event(struct notifier_block *this,
 static int __init bpq_init_driver(void)
 {
 #ifdef CONFIG_PROC_FS
-        if (!proc_create("bpqether", 0444, init_net.proc_net, &bpq_info_fops)) {
+        if (!proc_create_seq("bpqether", 0444, init_net.proc_net, &bpq_seqops)) {
                 printk(KERN_ERR
                         "bpq: cannot create /proc/net/bpqether entry.\n");
                 return -ENOENT;
diff --git a/drivers/net/hamradio/scc.c b/drivers/net/hamradio/scc.c
index 3de272959090..6c03932d8a6b 100644
--- a/drivers/net/hamradio/scc.c
+++ b/drivers/net/hamradio/scc.c
@@ -2084,21 +2084,6 @@ static const struct seq_operations scc_net_seq_ops = {
         .stop   = scc_net_seq_stop,
         .show   = scc_net_seq_show,
 };
-
-
-static int scc_net_seq_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &scc_net_seq_ops);
-}
-
-static const struct file_operations scc_net_seq_fops = {
-        .owner   = THIS_MODULE,
-        .open    = scc_net_seq_open,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
-        .release = seq_release_private,
-};
-
 #endif /* CONFIG_PROC_FS */
 
  
@@ -2122,7 +2107,7 @@ static int __init scc_init_driver (void)
         }
         rtnl_unlock();
 
-        proc_create("z8530drv", 0, init_net.proc_net, &scc_net_seq_fops);
+        proc_create_seq("z8530drv", 0, init_net.proc_net, &scc_net_seq_ops);
 
         return 0;
 }
diff --git a/drivers/net/hamradio/yam.c b/drivers/net/hamradio/yam.c
index 83034eb7ed4f..16ec7af6ab7b 100644
--- a/drivers/net/hamradio/yam.c
+++ b/drivers/net/hamradio/yam.c
@@ -841,20 +841,6 @@ static const struct seq_operations yam_seqops = {
         .stop = yam_seq_stop,
         .show = yam_seq_show,
 };
-
-static int yam_info_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &yam_seqops);
-}
-
-static const struct file_operations yam_info_fops = {
-        .owner = THIS_MODULE,
-        .open = yam_info_open,
-        .read = seq_read,
-        .llseek = seq_lseek,
-        .release = seq_release,
-};
-
 #endif
 
 
@@ -1168,7 +1154,7 @@ static int __init yam_init_driver(void)
         yam_timer.expires = jiffies + HZ / 100;
         add_timer(&yam_timer);
 
-        proc_create("yam", 0444, init_net.proc_net, &yam_info_fops);
+        proc_create_seq("yam", 0444, init_net.proc_net, &yam_seqops);
         return 0;
  error:
         while (--i >= 0) {
diff --git a/drivers/net/ppp/pppoe.c b/drivers/net/ppp/pppoe.c
index 7df07337d69c..ce61231e96ea 100644
--- a/drivers/net/ppp/pppoe.c
+++ b/drivers/net/ppp/pppoe.c
@@ -1096,21 +1096,6 @@ static const struct seq_operations pppoe_seq_ops = {
         .stop           = pppoe_seq_stop,
         .show           = pppoe_seq_show,
 };
-
-static int pppoe_seq_open(struct inode *inode, struct file *file)
-{
-        return seq_open_net(inode, file, &pppoe_seq_ops,
-                        sizeof(struct seq_net_private));
-}
-
-static const struct file_operations pppoe_seq_fops = {
-        .owner          = THIS_MODULE,
-        .open           = pppoe_seq_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release_net,
-};
-
 #endif /* CONFIG_PROC_FS */
 
 static const struct proto_ops pppoe_ops = {
@@ -1146,7 +1131,8 @@ static __net_init int pppoe_init_net(struct net *net)
 
         rwlock_init(&pn->hash_lock);
 
-        pde = proc_create("pppoe", 0444, net->proc_net, &pppoe_seq_fops);
+        pde = proc_create_net("pppoe", 0444, net->proc_net,
+                        &pppoe_seq_ops, sizeof(struct seq_net_private));
 #ifdef CONFIG_PROC_FS
         if (!pde)
                 return -ENOMEM;
diff --git a/drivers/net/wireless/atmel/atmel.c b/drivers/net/wireless/atmel/atmel.c
index d122386c382b..b01dc34d55af 100644
--- a/drivers/net/wireless/atmel/atmel.c
+++ b/drivers/net/wireless/atmel/atmel.c
@@ -1482,18 +1482,6 @@ static int atmel_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int atmel_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, atmel_proc_show, PDE_DATA(inode));
-}
-
-static const struct file_operations atmel_proc_fops = {
-        .open           = atmel_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static const struct net_device_ops atmel_netdev_ops = {
         .ndo_open               = atmel_open,
         .ndo_stop               = atmel_close,
@@ -1614,7 +1602,8 @@ struct net_device *init_atmel_card(unsigned short irq, unsigned long port,
 
         netif_carrier_off(dev);
 
-        if (!proc_create_data("driver/atmel", 0, NULL, &atmel_proc_fops, priv))
+        if (!proc_create_single_data("driver/atmel", 0, NULL, atmel_proc_show,
+                        priv))
                 printk(KERN_WARNING "atmel: unable to create /proc entry.\n");
 
         printk(KERN_INFO "%s: Atmel at76c50x. Version %d.%d. MAC %pM\n",
diff --git a/drivers/net/wireless/intersil/hostap/hostap_ap.c b/drivers/net/wireless/intersil/hostap/hostap_ap.c
index b4dfe1893d18..d1884b8913e7 100644
--- a/drivers/net/wireless/intersil/hostap/hostap_ap.c
+++ b/drivers/net/wireless/intersil/hostap/hostap_ap.c
@@ -69,7 +69,7 @@ static void prism2_send_mgmt(struct net_device *dev,
 #ifndef PRISM2_NO_PROCFS_DEBUG
 static int ap_debug_proc_show(struct seq_file *m, void *v)
 {
-        struct ap_data *ap = m->private;
+        struct ap_data *ap = PDE_DATA(file_inode(m->file));
 
         seq_printf(m, "BridgedUnicastFrames=%u\n", ap->bridged_unicast);
         seq_printf(m, "BridgedMulticastFrames=%u\n", ap->bridged_multicast);
@@ -81,18 +81,6 @@ static int ap_debug_proc_show(struct seq_file *m, void *v)
         seq_printf(m, "tx_drop_nonassoc=%u\n", ap->tx_drop_nonassoc);
         return 0;
 }
-
-static int ap_debug_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, ap_debug_proc_show, PDE_DATA(inode));
-}
-
-static const struct file_operations ap_debug_proc_fops = {
-        .open           = ap_debug_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
 #endif /* PRISM2_NO_PROCFS_DEBUG */
 
 
@@ -333,7 +321,7 @@ void hostap_deauth_all_stas(struct net_device *dev, struct ap_data *ap,
 
 static int ap_control_proc_show(struct seq_file *m, void *v)
 {
-        struct ap_data *ap = m->private;
+        struct ap_data *ap = PDE_DATA(file_inode(m->file));
         char *policy_txt;
         struct mac_entry *entry;
 
@@ -365,20 +353,20 @@ static int ap_control_proc_show(struct seq_file *m, void *v)
 
 static void *ap_control_proc_start(struct seq_file *m, loff_t *_pos)
 {
-        struct ap_data *ap = m->private;
+        struct ap_data *ap = PDE_DATA(file_inode(m->file));
         spin_lock_bh(&ap->mac_restrictions.lock);
         return seq_list_start_head(&ap->mac_restrictions.mac_list, *_pos);
 }
 
 static void *ap_control_proc_next(struct seq_file *m, void *v, loff_t *_pos)
 {
-        struct ap_data *ap = m->private;
+        struct ap_data *ap = PDE_DATA(file_inode(m->file));
         return seq_list_next(v, &ap->mac_restrictions.mac_list, _pos);
 }
 
 static void ap_control_proc_stop(struct seq_file *m, void *v)
 {
-        struct ap_data *ap = m->private;
+        struct ap_data *ap = PDE_DATA(file_inode(m->file));
         spin_unlock_bh(&ap->mac_restrictions.lock);
 }
 
@@ -389,24 +377,6 @@ static const struct seq_operations ap_control_proc_seqops = {
         .show   = ap_control_proc_show,
 };
 
-static int ap_control_proc_open(struct inode *inode, struct file *file)
-{
-        int ret = seq_open(file, &ap_control_proc_seqops);
-        if (ret == 0) {
-                struct seq_file *m = file->private_data;
-                m->private = PDE_DATA(inode);
-        }
-        return ret;
-}
-
-static const struct file_operations ap_control_proc_fops = {
-        .open           = ap_control_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release,
-};
-
-
 int ap_control_add_mac(struct mac_restrictions *mac_restrictions, u8 *mac)
 {
         struct mac_entry *entry;
@@ -585,20 +555,20 @@ static int prism2_ap_proc_show(struct seq_file *m, void *v)
 
 static void *prism2_ap_proc_start(struct seq_file *m, loff_t *_pos)
 {
-        struct ap_data *ap = m->private;
+        struct ap_data *ap = PDE_DATA(file_inode(m->file));
         spin_lock_bh(&ap->sta_table_lock);
         return seq_list_start_head(&ap->sta_list, *_pos);
 }
 
 static void *prism2_ap_proc_next(struct seq_file *m, void *v, loff_t *_pos)
 {
-        struct ap_data *ap = m->private;
+        struct ap_data *ap = PDE_DATA(file_inode(m->file));
         return seq_list_next(v, &ap->sta_list, _pos);
 }
 
 static void prism2_ap_proc_stop(struct seq_file *m, void *v)
 {
-        struct ap_data *ap = m->private;
+        struct ap_data *ap = PDE_DATA(file_inode(m->file));
         spin_unlock_bh(&ap->sta_table_lock);
 }
 
@@ -608,23 +578,6 @@ static const struct seq_operations prism2_ap_proc_seqops = {
         .stop   = prism2_ap_proc_stop,
         .show   = prism2_ap_proc_show,
 };
-
-static int prism2_ap_proc_open(struct inode *inode, struct file *file)
-{
-        int ret = seq_open(file, &prism2_ap_proc_seqops);
-        if (ret == 0) {
-                struct seq_file *m = file->private_data;
-                m->private = PDE_DATA(inode);
-        }
-        return ret;
-}
-
-static const struct file_operations prism2_ap_proc_fops = {
-        .open           = prism2_ap_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release,
-};
 #endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */
 
 
@@ -896,12 +849,13 @@ void hostap_init_ap_proc(local_info_t *local)
                 return;
 
 #ifndef PRISM2_NO_PROCFS_DEBUG
-        proc_create_data("ap_debug", 0, ap->proc, &ap_debug_proc_fops, ap);
+        proc_create_single_data("ap_debug", 0, ap->proc, ap_debug_proc_show, ap);
 #endif /* PRISM2_NO_PROCFS_DEBUG */
 
 #ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT
-        proc_create_data("ap_control", 0, ap->proc, &ap_control_proc_fops, ap);
-        proc_create_data("ap", 0, ap->proc, &prism2_ap_proc_fops, ap);
+        proc_create_seq_data("ap_control", 0, ap->proc, &ap_control_proc_seqops,
+                        ap);
+        proc_create_seq_data("ap", 0, ap->proc, &prism2_ap_proc_seqops, ap);
 #endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */
 
 }
@@ -1106,18 +1060,6 @@ static int prism2_sta_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int prism2_sta_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, prism2_sta_proc_show, PDE_DATA(inode));
-}
-
-static const struct file_operations prism2_sta_proc_fops = {
-        .open           = prism2_sta_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static void handle_add_proc_queue(struct work_struct *work)
 {
         struct ap_data *ap = container_of(work, struct ap_data,
@@ -1138,9 +1080,9 @@ static void handle_add_proc_queue(struct work_struct *work)
 
                 if (sta) {
                         sprintf(name, "%pM", sta->addr);
-                        sta->proc = proc_create_data(
+                        sta->proc = proc_create_single_data(
                                 name, 0, ap->proc,
-                                &prism2_sta_proc_fops, sta);
+                                prism2_sta_proc_show, sta);
 
                         atomic_dec(&sta->users);
                 }
diff --git a/drivers/net/wireless/intersil/hostap/hostap_hw.c b/drivers/net/wireless/intersil/hostap/hostap_hw.c
index 5c4a17a18968..2720aa39f530 100644
--- a/drivers/net/wireless/intersil/hostap/hostap_hw.c
+++ b/drivers/net/wireless/intersil/hostap/hostap_hw.c
@@ -2951,19 +2951,6 @@ static int prism2_registers_proc_show(struct seq_file *m, void *v)
 
         return 0;
 }
-
-static int prism2_registers_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, prism2_registers_proc_show, PDE_DATA(inode));
-}
-
-static const struct file_operations prism2_registers_proc_fops = {
-        .open           = prism2_registers_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 #endif /* PRISM2_NO_PROCFS_DEBUG */
 
 
@@ -3279,8 +3266,8 @@ static int hostap_hw_ready(struct net_device *dev)
                 }
                 hostap_init_proc(local);
 #ifndef PRISM2_NO_PROCFS_DEBUG
-                proc_create_data("registers", 0, local->proc,
-                                 &prism2_registers_proc_fops, local);
+                proc_create_single_data("registers", 0, local->proc,
+                                 prism2_registers_proc_show, local);
 #endif /* PRISM2_NO_PROCFS_DEBUG */
                 hostap_init_ap_proc(local);
                 return 0;
diff --git a/drivers/net/wireless/intersil/hostap/hostap_proc.c b/drivers/net/wireless/intersil/hostap/hostap_proc.c
index d234231bf532..5b33ccab9188 100644
--- a/drivers/net/wireless/intersil/hostap/hostap_proc.c
+++ b/drivers/net/wireless/intersil/hostap/hostap_proc.c
@@ -43,18 +43,6 @@ static int prism2_debug_proc_show(struct seq_file *m, void *v)
 
         return 0;
 }
-
-static int prism2_debug_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, prism2_debug_proc_show, PDE_DATA(inode));
-}
-
-static const struct file_operations prism2_debug_proc_fops = {
-        .open           = prism2_debug_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
 #endif /* PRISM2_NO_PROCFS_DEBUG */
 
 
@@ -95,19 +83,6 @@ static int prism2_stats_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int prism2_stats_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, prism2_stats_proc_show, PDE_DATA(inode));
-}
-
-static const struct file_operations prism2_stats_proc_fops = {
-        .open           = prism2_stats_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
-
 static int prism2_wds_proc_show(struct seq_file *m, void *v)
 {
         struct list_head *ptr = v;
@@ -122,20 +97,20 @@ static int prism2_wds_proc_show(struct seq_file *m, void *v)
 
 static void *prism2_wds_proc_start(struct seq_file *m, loff_t *_pos)
 {
-        local_info_t *local = m->private;
+        local_info_t *local = PDE_DATA(file_inode(m->file));
         read_lock_bh(&local->iface_lock);
         return seq_list_start(&local->hostap_interfaces, *_pos);
 }
 
 static void *prism2_wds_proc_next(struct seq_file *m, void *v, loff_t *_pos)
 {
-        local_info_t *local = m->private;
+        local_info_t *local = PDE_DATA(file_inode(m->file));
         return seq_list_next(v, &local->hostap_interfaces, _pos);
 }
 
 static void prism2_wds_proc_stop(struct seq_file *m, void *v)
 {
-        local_info_t *local = m->private;
+        local_info_t *local = PDE_DATA(file_inode(m->file));
         read_unlock_bh(&local->iface_lock);
 }
 
@@ -146,27 +121,9 @@ static const struct seq_operations prism2_wds_proc_seqops = {
         .show   = prism2_wds_proc_show,
 };
 
-static int prism2_wds_proc_open(struct inode *inode, struct file *file)
-{
-        int ret = seq_open(file, &prism2_wds_proc_seqops);
-        if (ret == 0) {
-                struct seq_file *m = file->private_data;
-                m->private = PDE_DATA(inode);
-        }
-        return ret;
-}
-
-static const struct file_operations prism2_wds_proc_fops = {
-        .open           = prism2_wds_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release,
-};
-
-
 static int prism2_bss_list_proc_show(struct seq_file *m, void *v)
 {
-        local_info_t *local = m->private;
+        local_info_t *local = PDE_DATA(file_inode(m->file));
         struct list_head *ptr = v;
         struct hostap_bss_info *bss;
 
@@ -193,20 +150,20 @@ static int prism2_bss_list_proc_show(struct seq_file *m, void *v)
 
 static void *prism2_bss_list_proc_start(struct seq_file *m, loff_t *_pos)
 {
-        local_info_t *local = m->private;
+        local_info_t *local = PDE_DATA(file_inode(m->file));
         spin_lock_bh(&local->lock);
         return seq_list_start_head(&local->bss_list, *_pos);
 }
 
 static void *prism2_bss_list_proc_next(struct seq_file *m, void *v, loff_t *_pos)
 {
-        local_info_t *local = m->private;
+        local_info_t *local = PDE_DATA(file_inode(m->file));
         return seq_list_next(v, &local->bss_list, _pos);
 }
 
 static void prism2_bss_list_proc_stop(struct seq_file *m, void *v)
 {
-        local_info_t *local = m->private;
+        local_info_t *local = PDE_DATA(file_inode(m->file));
         spin_unlock_bh(&local->lock);
 }
 
@@ -217,24 +174,6 @@ static const struct seq_operations prism2_bss_list_proc_seqops = {
         .show   = prism2_bss_list_proc_show,
 };
 
-static int prism2_bss_list_proc_open(struct inode *inode, struct file *file)
-{
-        int ret = seq_open(file, &prism2_bss_list_proc_seqops);
-        if (ret == 0) {
-                struct seq_file *m = file->private_data;
-                m->private = PDE_DATA(inode);
-        }
-        return ret;
-}
-
-static const struct file_operations prism2_bss_list_proc_fops = {
-        .open           = prism2_bss_list_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release,
-};
-
-
 static int prism2_crypt_proc_show(struct seq_file *m, void *v)
 {
         local_info_t *local = m->private;
@@ -252,19 +191,6 @@ static int prism2_crypt_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int prism2_crypt_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, prism2_crypt_proc_show, PDE_DATA(inode));
-}
-
-static const struct file_operations prism2_crypt_proc_fops = {
-        .open           = prism2_crypt_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
-
 static ssize_t prism2_pda_proc_read(struct file *file, char __user *buf,
                                     size_t count, loff_t *_pos)
 {
@@ -342,7 +268,7 @@ static int prism2_io_debug_proc_read(char *page, char **start, off_t off,
 #ifndef PRISM2_NO_STATION_MODES
 static int prism2_scan_results_proc_show(struct seq_file *m, void *v)
 {
-        local_info_t *local = m->private;
+        local_info_t *local = PDE_DATA(file_inode(m->file));
         unsigned long entry;
         int i, len;
         struct hfa384x_hostscan_result *scanres;
@@ -392,7 +318,7 @@ static int prism2_scan_results_proc_show(struct seq_file *m, void *v)
 
 static void *prism2_scan_results_proc_start(struct seq_file *m, loff_t *_pos)
 {
-        local_info_t *local = m->private;
+        local_info_t *local = PDE_DATA(file_inode(m->file));
         spin_lock_bh(&local->lock);
 
         /* We have a header (pos 0) + N results to show (pos 1...N) */
@@ -403,7 +329,7 @@ static void *prism2_scan_results_proc_start(struct seq_file *m, loff_t *_pos)
 
 static void *prism2_scan_results_proc_next(struct seq_file *m, void *v, loff_t *_pos)
 {
-        local_info_t *local = m->private;
+        local_info_t *local = PDE_DATA(file_inode(m->file));
 
         ++*_pos;
         if (*_pos > local->last_scan_results_count)
@@ -413,7 +339,7 @@ static void *prism2_scan_results_proc_next(struct seq_file *m, void *v, loff_t *
 
 static void prism2_scan_results_proc_stop(struct seq_file *m, void *v)
 {
-        local_info_t *local = m->private;
+        local_info_t *local = PDE_DATA(file_inode(m->file));
         spin_unlock_bh(&local->lock);
 }
 
@@ -423,25 +349,6 @@ static const struct seq_operations prism2_scan_results_proc_seqops = {
         .stop   = prism2_scan_results_proc_stop,
         .show   = prism2_scan_results_proc_show,
 };
-
-static int prism2_scan_results_proc_open(struct inode *inode, struct file *file)
-{
-        int ret = seq_open(file, &prism2_scan_results_proc_seqops);
-        if (ret == 0) {
-                struct seq_file *m = file->private_data;
-                m->private = PDE_DATA(inode);
-        }
-        return ret;
-}
-
-static const struct file_operations prism2_scan_results_proc_fops = {
-        .open           = prism2_scan_results_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release,
-};
-
-
 #endif /* PRISM2_NO_STATION_MODES */
 
 
@@ -463,29 +370,29 @@ void hostap_init_proc(local_info_t *local)
         }
 
 #ifndef PRISM2_NO_PROCFS_DEBUG
-        proc_create_data("debug", 0, local->proc,
-                         &prism2_debug_proc_fops, local);
+        proc_create_single_data("debug", 0, local->proc,
+                        prism2_debug_proc_show, local);
 #endif /* PRISM2_NO_PROCFS_DEBUG */
-        proc_create_data("stats", 0, local->proc,
-                         &prism2_stats_proc_fops, local);
-        proc_create_data("wds", 0, local->proc,
-                         &prism2_wds_proc_fops, local);
+        proc_create_single_data("stats", 0, local->proc, prism2_stats_proc_show,
+                        local);
+        proc_create_seq_data("wds", 0, local->proc,
+                        &prism2_wds_proc_seqops, local);
         proc_create_data("pda", 0, local->proc,
                          &prism2_pda_proc_fops, local);
         proc_create_data("aux_dump", 0, local->proc,
                          local->func->read_aux_fops ?: &prism2_aux_dump_proc_fops,
                          local);
-        proc_create_data("bss_list", 0, local->proc,
-                         &prism2_bss_list_proc_fops, local);
-        proc_create_data("crypt", 0, local->proc,
-                         &prism2_crypt_proc_fops, local);
+        proc_create_seq_data("bss_list", 0, local->proc,
+                        &prism2_bss_list_proc_seqops, local);
+        proc_create_single_data("crypt", 0, local->proc, prism2_crypt_proc_show,
+                local);
 #ifdef PRISM2_IO_DEBUG
-        proc_create_data("io_debug", 0, local->proc,
-                         &prism2_io_debug_proc_fops, local);
+        proc_create_single_data("io_debug", 0, local->proc,
+                        prism2_debug_proc_show, local);
 #endif /* PRISM2_IO_DEBUG */
 #ifndef PRISM2_NO_STATION_MODES
-        proc_create_data("scan_results", 0, local->proc,
-                         &prism2_scan_results_proc_fops, local);
+        proc_create_seq_data("scan_results", 0, local->proc,
+                        &prism2_scan_results_proc_seqops, local);
 #endif /* PRISM2_NO_STATION_MODES */
 }
 
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c
index 7f9b16b97ea3..a7e0a17aa7e8 100644
--- a/drivers/net/wireless/ray_cs.c
+++ b/drivers/net/wireless/ray_cs.c
@@ -2663,19 +2663,6 @@ static int ray_cs_proc_show(struct seq_file *m, void *v)
         }
         return 0;
 }
-
-static int ray_cs_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, ray_cs_proc_show, NULL);
-}
-
-static const struct file_operations ray_cs_proc_fops = {
-        .owner = THIS_MODULE,
-        .open = ray_cs_proc_open,
-        .read = seq_read,
-        .llseek = seq_lseek,
-        .release = single_release,
-};
 #endif
 /*===========================================================================*/
 static int build_auth_frame(ray_dev_t *local, UCHAR *dest, int auth_type)
@@ -2814,7 +2801,7 @@ static int __init init_ray_cs(void)
 #ifdef CONFIG_PROC_FS
         proc_mkdir("driver/ray_cs", NULL);
 
-        proc_create("driver/ray_cs/ray_cs", 0, NULL, &ray_cs_proc_fops);
+        proc_create_single("driver/ray_cs/ray_cs", 0, NULL, ray_cs_proc_show);
         proc_create("driver/ray_cs/essid", 0200, NULL, &ray_cs_essid_proc_fops);
         proc_create_data("driver/ray_cs/net_type", 0200, NULL, &int_proc_fops,
                          &net_type);
diff --git a/drivers/nubus/proc.c b/drivers/nubus/proc.c
index c2e5a7e6bd3e..88e1f9a0faaf 100644
--- a/drivers/nubus/proc.c
+++ b/drivers/nubus/proc.c
@@ -45,18 +45,6 @@ nubus_devices_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int nubus_devices_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, nubus_devices_proc_show, NULL);
-}
-
-static const struct file_operations nubus_devices_proc_fops = {
-        .open           = nubus_devices_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static struct proc_dir_entry *proc_bus_nubus_dir;
 
 /*
@@ -149,18 +137,6 @@ static int nubus_proc_rsrc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int nubus_proc_rsrc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, nubus_proc_rsrc_show, inode);
-}
-
-static const struct file_operations nubus_proc_rsrc_fops = {
-        .open           = nubus_proc_rsrc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 void nubus_proc_add_rsrc_mem(struct proc_dir_entry *procdir,
                              const struct nubus_dirent *ent,
                              unsigned int size)
@@ -176,8 +152,8 @@ void nubus_proc_add_rsrc_mem(struct proc_dir_entry *procdir,
                 pde_data = nubus_proc_alloc_pde_data(nubus_dirptr(ent), size);
         else
                 pde_data = NULL;
-        proc_create_data(name, S_IFREG | 0444, procdir,
-                         &nubus_proc_rsrc_fops, pde_data);
+        proc_create_single_data(name, S_IFREG | 0444, procdir,
+                        nubus_proc_rsrc_show, pde_data);
 }
 
 void nubus_proc_add_rsrc(struct proc_dir_entry *procdir,
@@ -190,32 +166,21 @@ void nubus_proc_add_rsrc(struct proc_dir_entry *procdir,
                 return;
 
         snprintf(name, sizeof(name), "%x", ent->type);
-        proc_create_data(name, S_IFREG | 0444, procdir,
-                         &nubus_proc_rsrc_fops,
-                         nubus_proc_alloc_pde_data(data, 0));
+        proc_create_single_data(name, S_IFREG | 0444, procdir,
+                        nubus_proc_rsrc_show,
+                        nubus_proc_alloc_pde_data(data, 0));
 }
 
 /*
  * /proc/nubus stuff
  */
 
-static int nubus_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, nubus_proc_show, NULL);
-}
-
-static const struct file_operations nubus_proc_fops = {
-        .open           = nubus_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 void __init nubus_proc_init(void)
 {
-        proc_create("nubus", 0, NULL, &nubus_proc_fops);
+        proc_create_single("nubus", 0, NULL, nubus_proc_show);
         proc_bus_nubus_dir = proc_mkdir("bus/nubus", NULL);
         if (!proc_bus_nubus_dir)
                 return;
-        proc_create("devices", 0, proc_bus_nubus_dir, &nubus_devices_proc_fops);
+        proc_create_single("devices", 0, proc_bus_nubus_dir,
+                        nubus_devices_proc_show);
 }
diff --git a/drivers/parisc/ccio-dma.c b/drivers/parisc/ccio-dma.c
index 297599fcbc32..d29cedb3f23b 100644
--- a/drivers/parisc/ccio-dma.c
+++ b/drivers/parisc/ccio-dma.c
@@ -1108,19 +1108,6 @@ static int ccio_proc_info(struct seq_file *m, void *p)
         return 0;
 }
 
-static int ccio_proc_info_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, &ccio_proc_info, NULL);
-}
-
-static const struct file_operations ccio_proc_info_fops = {
-        .owner = THIS_MODULE,
-        .open = ccio_proc_info_open,
-        .read = seq_read,
-        .llseek = seq_lseek,
-        .release = single_release,
-};
-
 static int ccio_proc_bitmap_info(struct seq_file *m, void *p)
 {
         struct ioc *ioc = ioc_list;
@@ -1135,19 +1122,6 @@ static int ccio_proc_bitmap_info(struct seq_file *m, void *p)
 
         return 0;
 }
-
-static int ccio_proc_bitmap_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, &ccio_proc_bitmap_info, NULL);
-}
-
-static const struct file_operations ccio_proc_bitmap_fops = {
-        .owner = THIS_MODULE,
-        .open = ccio_proc_bitmap_open,
-        .read = seq_read,
-        .llseek = seq_lseek,
-        .release = single_release,
-};
 #endif /* CONFIG_PROC_FS */
 
 /**
@@ -1589,10 +1563,10 @@ static int __init ccio_probe(struct parisc_device *dev)
 
 #ifdef CONFIG_PROC_FS
         if (ioc_count == 0) {
-                proc_create(MODULE_NAME, 0, proc_runway_root,
-                            &ccio_proc_info_fops);
-                proc_create(MODULE_NAME"-bitmap", 0, proc_runway_root,
-                            &ccio_proc_bitmap_fops);
+                proc_create_single(MODULE_NAME, 0, proc_runway_root,
+                                ccio_proc_info);
+                proc_create_single(MODULE_NAME"-bitmap", 0, proc_runway_root,
+                                ccio_proc_bitmap_info);
         }
 #endif
         ioc_count++;
diff --git a/drivers/parisc/sba_iommu.c b/drivers/parisc/sba_iommu.c
index 0a9c762a70fa..0d33d1f86d10 100644
--- a/drivers/parisc/sba_iommu.c
+++ b/drivers/parisc/sba_iommu.c
@@ -1864,20 +1864,6 @@ static int sba_proc_info(struct seq_file *m, void *p)
 }
 
 static int
-sba_proc_open(struct inode *i, struct file *f)
-{
-        return single_open(f, &sba_proc_info, NULL);
-}
-
-static const struct file_operations sba_proc_fops = {
-        .owner = THIS_MODULE,
-        .open = sba_proc_open,
-        .read = seq_read,
-        .llseek = seq_lseek,
-        .release = single_release,
-};
-
-static int
 sba_proc_bitmap_info(struct seq_file *m, void *p)
 {
         struct sba_device *sba_dev = sba_list;
@@ -1889,20 +1875,6 @@ sba_proc_bitmap_info(struct seq_file *m, void *p)
 
         return 0;
 }
-
-static int
-sba_proc_bitmap_open(struct inode *i, struct file *f)
-{
-        return single_open(f, &sba_proc_bitmap_info, NULL);
-}
-
-static const struct file_operations sba_proc_bitmap_fops = {
-        .owner = THIS_MODULE,
-        .open = sba_proc_bitmap_open,
-        .read = seq_read,
-        .llseek = seq_lseek,
-        .release = single_release,
-};
 #endif /* CONFIG_PROC_FS */
 
 static const struct parisc_device_id sba_tbl[] __initconst = {
@@ -2014,8 +1986,8 @@ static int __init sba_driver_callback(struct parisc_device *dev)
                 break;
         }
 
-        proc_create("sba_iommu", 0, root, &sba_proc_fops);
-        proc_create("sba_iommu-bitmap", 0, root, &sba_proc_bitmap_fops);
+        proc_create_single("sba_iommu", 0, root, sba_proc_info);
+        proc_create_single("sba_iommu-bitmap", 0, root, sba_proc_bitmap_info);
 #endif
 
         parisc_has_iommu();
diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
index 1ee8927a0635..7ac035af39f0 100644
--- a/drivers/pci/proc.c
+++ b/drivers/pci/proc.c
@@ -435,25 +435,12 @@ int pci_proc_detach_bus(struct pci_bus *bus)
         return 0;
 }
 
-static int proc_bus_pci_dev_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &proc_bus_pci_devices_op);
-}
-
-static const struct file_operations proc_bus_pci_dev_operations = {
-        .owner          = THIS_MODULE,
-        .open           = proc_bus_pci_dev_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release,
-};
-
 static int __init pci_proc_init(void)
 {
         struct pci_dev *dev = NULL;
         proc_bus_pci_dir = proc_mkdir("bus/pci", NULL);
-        proc_create("devices", 0, proc_bus_pci_dir,
-                    &proc_bus_pci_dev_operations);
+        proc_create_seq("devices", 0, proc_bus_pci_dir,
+                    &proc_bus_pci_devices_op);
         proc_initialized = 1;
         for_each_pci_dev(dev)
                 pci_proc_attach_device(dev);
diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c
index e8d058c5ef21..eef76bfa5d73 100644
--- a/drivers/platform/x86/toshiba_acpi.c
+++ b/drivers/platform/x86/toshiba_acpi.c
@@ -1689,19 +1689,6 @@ static int version_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int version_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, version_proc_show, PDE_DATA(inode));
-}
-
-static const struct file_operations version_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = version_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 /*
  * Proc and module init
  */
@@ -1722,8 +1709,8 @@ static void create_toshiba_proc_entries(struct toshiba_acpi_dev *dev)
         if (dev->hotkey_dev)
                 proc_create_data("keys", S_IRUGO | S_IWUSR, toshiba_proc_dir,
                                  &keys_proc_fops, dev);
-        proc_create_data("version", S_IRUGO, toshiba_proc_dir,
-                         &version_proc_fops, dev);
+        proc_create_single_data("version", S_IRUGO, toshiba_proc_dir,
+                        version_proc_show, dev);
 }
 
 static void remove_toshiba_proc_entries(struct toshiba_acpi_dev *dev)
diff --git a/drivers/pnp/pnpbios/proc.c b/drivers/pnp/pnpbios/proc.c
index 7d4aca7948dd..fe1c8f5d9af0 100644
--- a/drivers/pnp/pnpbios/proc.c
+++ b/drivers/pnp/pnpbios/proc.c
@@ -47,19 +47,6 @@ static int pnpconfig_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int pnpconfig_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, pnpconfig_proc_show, NULL);
-}
-
-static const struct file_operations pnpconfig_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = pnpconfig_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static int escd_info_proc_show(struct seq_file *m, void *v)
 {
         struct escd_info_struc escd;
@@ -74,19 +61,6 @@ static int escd_info_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int escd_info_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, escd_info_proc_show, NULL);
-}
-
-static const struct file_operations escd_info_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = escd_info_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 #define MAX_SANE_ESCD_SIZE (32*1024)
 static int escd_proc_show(struct seq_file *m, void *v)
 {
@@ -129,19 +103,6 @@ static int escd_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int escd_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, escd_proc_show, NULL);
-}
-
-static const struct file_operations escd_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = escd_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static int pnp_legacyres_proc_show(struct seq_file *m, void *v)
 {
         void *buf;
@@ -159,19 +120,6 @@ static int pnp_legacyres_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int pnp_legacyres_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, pnp_legacyres_proc_show, NULL);
-}
-
-static const struct file_operations pnp_legacyres_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = pnp_legacyres_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static int pnp_devices_proc_show(struct seq_file *m, void *v)
 {
         struct pnp_bios_node *node;
@@ -202,19 +150,6 @@ static int pnp_devices_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int pnp_devices_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, pnp_devices_proc_show, NULL);
-}
-
-static const struct file_operations pnp_devices_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = pnp_devices_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static int pnpbios_proc_show(struct seq_file *m, void *v)
 {
         void *data = m->private;
@@ -318,12 +253,13 @@ int __init pnpbios_proc_init(void)
         proc_pnp_boot = proc_mkdir("boot", proc_pnp);
         if (!proc_pnp_boot)
                 return -EIO;
-        proc_create("devices", 0, proc_pnp, &pnp_devices_proc_fops);
-        proc_create("configuration_info", 0, proc_pnp, &pnpconfig_proc_fops);
-        proc_create("escd_info", 0, proc_pnp, &escd_info_proc_fops);
-        proc_create("escd", S_IRUSR, proc_pnp, &escd_proc_fops);
-        proc_create("legacy_device_resources", 0, proc_pnp, &pnp_legacyres_proc_fops);
-
+        proc_create_single("devices", 0, proc_pnp, pnp_devices_proc_show);
+        proc_create_single("configuration_info", 0, proc_pnp,
+                        pnpconfig_proc_show);
+        proc_create_single("escd_info", 0, proc_pnp, escd_info_proc_show);
+        proc_create_single("escd", S_IRUSR, proc_pnp, escd_proc_show);
+        proc_create_single("legacy_device_resources", 0, proc_pnp,
+                        pnp_legacyres_proc_show);
         return 0;
 }
 
diff --git a/drivers/rtc/rtc-proc.c b/drivers/rtc/rtc-proc.c
index 31e7e23cc5be..a9dd9218fae2 100644
--- a/drivers/rtc/rtc-proc.c
+++ b/drivers/rtc/rtc-proc.c
@@ -107,40 +107,11 @@ static int rtc_proc_show(struct seq_file *seq, void *offset)
         return 0;
 }
 
-static int rtc_proc_open(struct inode *inode, struct file *file)
-{
-        int ret;
-        struct rtc_device *rtc = PDE_DATA(inode);
-
-        if (!try_module_get(rtc->owner))
-                return -ENODEV;
-
-        ret = single_open(file, rtc_proc_show, rtc);
-        if (ret)
-                module_put(rtc->owner);
-        return ret;
-}
-
-static int rtc_proc_release(struct inode *inode, struct file *file)
-{
-        int res = single_release(inode, file);
-        struct rtc_device *rtc = PDE_DATA(inode);
-
-        module_put(rtc->owner);
-        return res;
-}
-
-static const struct file_operations rtc_proc_fops = {
-        .open           = rtc_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = rtc_proc_release,
-};
-
 void rtc_proc_add_device(struct rtc_device *rtc)
 {
         if (is_rtc_hctosys(rtc))
-                proc_create_data("driver/rtc", 0, NULL, &rtc_proc_fops, rtc);
+                proc_create_single_data("driver/rtc", 0, NULL, rtc_proc_show,
+                                rtc);
 }
 
 void rtc_proc_del_device(struct rtc_device *rtc)
diff --git a/drivers/s390/block/dasd_proc.c b/drivers/s390/block/dasd_proc.c
index c33788a829c3..5cb80c645489 100644
--- a/drivers/s390/block/dasd_proc.c
+++ b/drivers/s390/block/dasd_proc.c
@@ -131,19 +131,6 @@ static const struct seq_operations dasd_devices_seq_ops = {
         .show           = dasd_devices_show,
 };
 
-static int dasd_devices_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &dasd_devices_seq_ops);
-}
-
-static const struct file_operations dasd_devices_file_ops = {
-        .owner          = THIS_MODULE,
-        .open           = dasd_devices_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release,
-};
-
 #ifdef CONFIG_DASD_PROFILE
 static int dasd_stats_all_block_on(void)
 {
@@ -352,10 +339,10 @@ dasd_proc_init(void)
         dasd_proc_root_entry = proc_mkdir("dasd", NULL);
         if (!dasd_proc_root_entry)
                 goto out_nodasd;
-        dasd_devices_entry = proc_create("devices",
+        dasd_devices_entry = proc_create_seq("devices",
                                          S_IFREG | S_IRUGO | S_IWUSR,
                                          dasd_proc_root_entry,
-                                         &dasd_devices_file_ops);
+                                         &dasd_devices_seq_ops);
         if (!dasd_devices_entry)
                 goto out_nodevices;
         dasd_statistics_entry = proc_create("statistics",
diff --git a/drivers/s390/char/tape_proc.c b/drivers/s390/char/tape_proc.c
index faae30476f4b..32a14ee31c6b 100644
--- a/drivers/s390/char/tape_proc.c
+++ b/drivers/s390/char/tape_proc.c
@@ -105,29 +105,14 @@ static const struct seq_operations tape_proc_seq = {
         .show           = tape_proc_show,
 };
 
-static int tape_proc_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &tape_proc_seq);
-}
-
-static const struct file_operations tape_proc_ops =
-{
-        .owner          = THIS_MODULE,
-        .open           = tape_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release,
-};
-
 /*
  * Initialize procfs stuff on startup
  */
 void
 tape_proc_init(void)
 {
-        tape_proc_devices =
-                proc_create("tapedevices", S_IFREG | S_IRUGO | S_IWUSR, NULL,
-                            &tape_proc_ops);
+        tape_proc_devices = proc_create_seq("tapedevices",
+                        S_IFREG | S_IRUGO | S_IWUSR, NULL,  &tape_proc_seq);
         if (tape_proc_devices == NULL) {
                 return;
         }
diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c
index 7195cff51d4c..91f5e2c68dbc 100644
--- a/drivers/scsi/megaraid.c
+++ b/drivers/scsi/megaraid.c
@@ -2731,53 +2731,6 @@ proc_show_rdrv_40(struct seq_file *m, void *v)
         return proc_show_rdrv(m, m->private, 30, 39);
 }
 
-
-/*
- * seq_file wrappers for procfile show routines.
- */
-static int mega_proc_open(struct inode *inode, struct file *file)
-{
-        adapter_t *adapter = proc_get_parent_data(inode);
-        int (*show)(struct seq_file *, void *) = PDE_DATA(inode);
-
-        return single_open(file, show, adapter);
-}
-
-static const struct file_operations mega_proc_fops = {
-        .open           = mega_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
-/*
- * Table of proc files we need to create.
- */
-struct mega_proc_file {
-        const char *name;
-        unsigned short ptr_offset;
-        int (*show) (struct seq_file *m, void *v);
-};
-
-static const struct mega_proc_file mega_proc_files[] = {
-        { "config",           offsetof(adapter_t, proc_read), proc_show_config },
-        { "stat",             offsetof(adapter_t, proc_stat), proc_show_stat },
-        { "mailbox",          offsetof(adapter_t, proc_mbox), proc_show_mbox },
-#if MEGA_HAVE_ENH_PROC
-        { "rebuild-rate",     offsetof(adapter_t, proc_rr), proc_show_rebuild_rate },
-        { "battery-status",   offsetof(adapter_t, proc_battery), proc_show_battery },
-        { "diskdrives-ch0",   offsetof(adapter_t, proc_pdrvstat[0]), proc_show_pdrv_ch0 },
-        { "diskdrives-ch1",   offsetof(adapter_t, proc_pdrvstat[1]), proc_show_pdrv_ch1 },
-        { "diskdrives-ch2",   offsetof(adapter_t, proc_pdrvstat[2]), proc_show_pdrv_ch2 },
-        { "diskdrives-ch3",   offsetof(adapter_t, proc_pdrvstat[3]), proc_show_pdrv_ch3 },
-        { "raiddrives-0-9",   offsetof(adapter_t, proc_rdrvstat[0]), proc_show_rdrv_10 },
-        { "raiddrives-10-19", offsetof(adapter_t, proc_rdrvstat[1]), proc_show_rdrv_20 },
-        { "raiddrives-20-29", offsetof(adapter_t, proc_rdrvstat[2]), proc_show_rdrv_30 },
-        { "raiddrives-30-39", offsetof(adapter_t, proc_rdrvstat[3]), proc_show_rdrv_40 },
-#endif
-        { NULL }
-};
-
 /**
  * mega_create_proc_entry()
  * @index - index in soft state array
@@ -2788,31 +2741,45 @@ static const struct mega_proc_file mega_proc_files[] = {
 static void
 mega_create_proc_entry(int index, struct proc_dir_entry *parent)
 {
-        const struct mega_proc_file *f;
-        adapter_t       *adapter = hba_soft_state[index];
-        struct proc_dir_entry   *dir, *de, **ppde;
-        u8              string[16];
+        adapter_t *adapter = hba_soft_state[index];
+        struct proc_dir_entry *dir;
+        u8 string[16];
 
         sprintf(string, "hba%d", adapter->host->host_no);
-
-        dir = adapter->controller_proc_dir_entry =
-                proc_mkdir_data(string, 0, parent, adapter);
-        if(!dir) {
+        dir = proc_mkdir_data(string, 0, parent, adapter);
+        if (!dir) {
                 dev_warn(&adapter->dev->dev, "proc_mkdir failed\n");
                 return;
         }
 
-        for (f = mega_proc_files; f->name; f++) {
-                de = proc_create_data(f->name, S_IRUSR, dir, &mega_proc_fops,
-                                      f->show);
-                if (!de) {
-                        dev_warn(&adapter->dev->dev, "proc_create failed\n");
-                        return;
-                }
-
-                ppde = (void *)adapter + f->ptr_offset;
-                *ppde = de;
-        }
+        proc_create_single_data("config", S_IRUSR, dir,
+                        proc_show_config, adapter);
+        proc_create_single_data("stat", S_IRUSR, dir,
+                        proc_show_stat, adapter);
+        proc_create_single_data("mailbox", S_IRUSR, dir,
+                        proc_show_mbox, adapter);
+#if MEGA_HAVE_ENH_PROC
+        proc_create_single_data("rebuild-rate", S_IRUSR, dir,
+                        proc_show_rebuild_rate, adapter);
+        proc_create_single_data("battery-status", S_IRUSR, dir,
+                        proc_show_battery, adapter);
+        proc_create_single_data("diskdrives-ch0", S_IRUSR, dir,
+                        proc_show_pdrv_ch0, adapter);
+        proc_create_single_data("diskdrives-ch1", S_IRUSR, dir,
+                        proc_show_pdrv_ch1, adapter);
+        proc_create_single_data("diskdrives-ch2", S_IRUSR, dir,
+                        proc_show_pdrv_ch2, adapter);
+        proc_create_single_data("diskdrives-ch3", S_IRUSR, dir,
+                        proc_show_pdrv_ch3, adapter);
+        proc_create_single_data("raiddrives-0-9", S_IRUSR, dir,
+                        proc_show_rdrv_10, adapter);
+        proc_create_single_data("raiddrives-10-19", S_IRUSR, dir,
+                        proc_show_rdrv_20, adapter);
+        proc_create_single_data("raiddrives-20-29", S_IRUSR, dir,
+                        proc_show_rdrv_30, adapter);
+        proc_create_single_data("raiddrives-30-39", S_IRUSR, dir,
+                        proc_show_rdrv_40, adapter);
+#endif
 }
 
 #else
@@ -4580,6 +4547,7 @@ megaraid_remove_one(struct pci_dev *pdev)
 {
         struct Scsi_Host *host = pci_get_drvdata(pdev);
         adapter_t *adapter = (adapter_t *)host->hostdata;
+        char buf[12] = { 0 };
 
         scsi_remove_host(host);
 
@@ -4594,44 +4562,8 @@ megaraid_remove_one(struct pci_dev *pdev)
 
         mega_free_sgl(adapter);
 
-#ifdef CONFIG_PROC_FS
-        if (adapter->controller_proc_dir_entry) {
-                remove_proc_entry("stat", adapter->controller_proc_dir_entry);
-                remove_proc_entry("config",
-                                adapter->controller_proc_dir_entry);
-                remove_proc_entry("mailbox",
-                                adapter->controller_proc_dir_entry);
-#if MEGA_HAVE_ENH_PROC
-                remove_proc_entry("rebuild-rate",
-                                adapter->controller_proc_dir_entry);
-                remove_proc_entry("battery-status",
-                                adapter->controller_proc_dir_entry);
-
-                remove_proc_entry("diskdrives-ch0",
-                                adapter->controller_proc_dir_entry);
-                remove_proc_entry("diskdrives-ch1",
-                                adapter->controller_proc_dir_entry);
-                remove_proc_entry("diskdrives-ch2",
-                                adapter->controller_proc_dir_entry);
-                remove_proc_entry("diskdrives-ch3",
-                                adapter->controller_proc_dir_entry);
-
-                remove_proc_entry("raiddrives-0-9",
-                                adapter->controller_proc_dir_entry);
-                remove_proc_entry("raiddrives-10-19",
-                                adapter->controller_proc_dir_entry);
-                remove_proc_entry("raiddrives-20-29",
-                                adapter->controller_proc_dir_entry);
-                remove_proc_entry("raiddrives-30-39",
-                                adapter->controller_proc_dir_entry);
-#endif
-                {
-                        char    buf[12] = { 0 };
-                        sprintf(buf, "hba%d", adapter->host->host_no);
-                        remove_proc_entry(buf, mega_proc_dir_entry);
-                }
-        }
-#endif
+        sprintf(buf, "hba%d", adapter->host->host_no);
+        remove_proc_subtree(buf, mega_proc_dir_entry);
 
         pci_free_consistent(adapter->dev, MEGA_BUFFER_SIZE,
                         adapter->mega_buffer, adapter->buf_dma_handle);
diff --git a/drivers/scsi/megaraid.h b/drivers/scsi/megaraid.h
index 21eba2fd465a..18e85d9267ff 100644
--- a/drivers/scsi/megaraid.h
+++ b/drivers/scsi/megaraid.h
@@ -814,18 +814,6 @@ typedef struct {
 
 #ifdef CONFIG_PROC_FS
         struct proc_dir_entry   *controller_proc_dir_entry;
-        struct proc_dir_entry   *proc_read;
-        struct proc_dir_entry   *proc_stat;
-        struct proc_dir_entry   *proc_mbox;
-
-#if MEGA_HAVE_ENH_PROC
-        struct proc_dir_entry   *proc_rr;
-        struct proc_dir_entry   *proc_battery;
-#define MAX_PROC_CHANNELS       4
-        struct proc_dir_entry   *proc_pdrvstat[MAX_PROC_CHANNELS];
-        struct proc_dir_entry   *proc_rdrvstat[MAX_PROC_CHANNELS];
-#endif
-
 #endif
 
         int     has_64bit_addr;         /* are we using 64-bit addressing */
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index b6f174df9c8c..6fc58e2c99d3 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -66,7 +66,6 @@ static int sg_version_num = 30536;	/* 2 digits for each component */
 static char *sg_version_date = "20140603";
 
 static int sg_proc_init(void);
-static void sg_proc_cleanup(void);
 #endif
 
 #define SG_ALLOW_DIO_DEF 0
@@ -1661,7 +1660,7 @@ static void __exit
 exit_sg(void)
 {
 #ifdef CONFIG_SCSI_PROC_FS
-        sg_proc_cleanup();
+        remove_proc_subtree("scsi/sg", NULL);
 #endif                          /* CONFIG_SCSI_PROC_FS */
         scsi_unregister_interface(&sg_interface);
         class_destroy(sg_sysfs_class);
@@ -2274,11 +2273,6 @@ sg_get_dev(int dev)
 }
 
 #ifdef CONFIG_SCSI_PROC_FS
-
-static struct proc_dir_entry *sg_proc_sgp = NULL;
-
-static char sg_proc_sg_dirname[] = "scsi/sg";
-
 static int sg_proc_seq_show_int(struct seq_file *s, void *v);
 
 static int sg_proc_single_open_adio(struct inode *inode, struct file *file);
@@ -2306,37 +2300,11 @@ static const struct file_operations dressz_fops = {
 };
 
 static int sg_proc_seq_show_version(struct seq_file *s, void *v);
-static int sg_proc_single_open_version(struct inode *inode, struct file *file);
-static const struct file_operations version_fops = {
-        .owner = THIS_MODULE,
-        .open = sg_proc_single_open_version,
-        .read = seq_read,
-        .llseek = seq_lseek,
-        .release = single_release,
-};
-
 static int sg_proc_seq_show_devhdr(struct seq_file *s, void *v);
-static int sg_proc_single_open_devhdr(struct inode *inode, struct file *file);
-static const struct file_operations devhdr_fops = {
-        .owner = THIS_MODULE,
-        .open = sg_proc_single_open_devhdr,
-        .read = seq_read,
-        .llseek = seq_lseek,
-        .release = single_release,
-};
-
 static int sg_proc_seq_show_dev(struct seq_file *s, void *v);
-static int sg_proc_open_dev(struct inode *inode, struct file *file);
 static void * dev_seq_start(struct seq_file *s, loff_t *pos);
 static void * dev_seq_next(struct seq_file *s, void *v, loff_t *pos);
 static void dev_seq_stop(struct seq_file *s, void *v);
-static const struct file_operations dev_fops = {
-        .owner = THIS_MODULE,
-        .open = sg_proc_open_dev,
-        .read = seq_read,
-        .llseek = seq_lseek,
-        .release = seq_release,
-};
 static const struct seq_operations dev_seq_ops = {
         .start = dev_seq_start,
         .next  = dev_seq_next,
@@ -2345,14 +2313,6 @@ static const struct seq_operations dev_seq_ops = {
 };
 
 static int sg_proc_seq_show_devstrs(struct seq_file *s, void *v);
-static int sg_proc_open_devstrs(struct inode *inode, struct file *file);
-static const struct file_operations devstrs_fops = {
-        .owner = THIS_MODULE,
-        .open = sg_proc_open_devstrs,
-        .read = seq_read,
-        .llseek = seq_lseek,
-        .release = seq_release,
-};
 static const struct seq_operations devstrs_seq_ops = {
         .start = dev_seq_start,
         .next  = dev_seq_next,
@@ -2361,14 +2321,6 @@ static const struct seq_operations devstrs_seq_ops = {
 };
 
 static int sg_proc_seq_show_debug(struct seq_file *s, void *v);
-static int sg_proc_open_debug(struct inode *inode, struct file *file);
-static const struct file_operations debug_fops = {
-        .owner = THIS_MODULE,
-        .open = sg_proc_open_debug,
-        .read = seq_read,
-        .llseek = seq_lseek,
-        .release = seq_release,
-};
 static const struct seq_operations debug_seq_ops = {
         .start = dev_seq_start,
         .next  = dev_seq_next,
@@ -2376,50 +2328,23 @@ static const struct seq_operations debug_seq_ops = {
         .show  = sg_proc_seq_show_debug,
 };
 
-
-struct sg_proc_leaf {
-        const char * name;
-        const struct file_operations * fops;
-};
-
-static const struct sg_proc_leaf sg_proc_leaf_arr[] = {
-        {"allow_dio", &adio_fops},
-        {"debug", &debug_fops},
-        {"def_reserved_size", &dressz_fops},
-        {"device_hdr", &devhdr_fops},
-        {"devices", &dev_fops},
-        {"device_strs", &devstrs_fops},
-        {"version", &version_fops}
-};
-
 static int
 sg_proc_init(void)
 {
-        int num_leaves = ARRAY_SIZE(sg_proc_leaf_arr);
-        int k;
+        struct proc_dir_entry *p;
 
-        sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL);
-        if (!sg_proc_sgp)
+        p = proc_mkdir("scsi/sg", NULL);
+        if (!p)
                 return 1;
-        for (k = 0; k < num_leaves; ++k) {
-                const struct sg_proc_leaf *leaf = &sg_proc_leaf_arr[k];
-                umode_t mask = leaf->fops->write ? S_IRUGO | S_IWUSR : S_IRUGO;
-                proc_create(leaf->name, mask, sg_proc_sgp, leaf->fops);
-        }
-        return 0;
-}
 
-static void
-sg_proc_cleanup(void)
-{
-        int k;
-        int num_leaves = ARRAY_SIZE(sg_proc_leaf_arr);
-
-        if (!sg_proc_sgp)
-                return;
-        for (k = 0; k < num_leaves; ++k)
-                remove_proc_entry(sg_proc_leaf_arr[k].name, sg_proc_sgp);
-        remove_proc_entry(sg_proc_sg_dirname, NULL);
+        proc_create("allow_dio", S_IRUGO | S_IWUSR, p, &adio_fops);
+        proc_create_seq("debug", S_IRUGO, p, &debug_seq_ops);
+        proc_create("def_reserved_size", S_IRUGO | S_IWUSR, p, &dressz_fops);
+        proc_create_single("device_hdr", S_IRUGO, p, sg_proc_seq_show_devhdr);
+        proc_create_seq("devices", S_IRUGO, p, &dev_seq_ops);
+        proc_create_seq("device_strs", S_IRUGO, p, &devstrs_seq_ops);
+        proc_create_single("version", S_IRUGO, p, sg_proc_seq_show_version);
+        return 0;
 }
 
 
@@ -2482,22 +2407,12 @@ static int sg_proc_seq_show_version(struct seq_file *s, void *v)
         return 0;
 }
 
-static int sg_proc_single_open_version(struct inode *inode, struct file *file)
-{
-        return single_open(file, sg_proc_seq_show_version, NULL);
-}
-
 static int sg_proc_seq_show_devhdr(struct seq_file *s, void *v)
 {
         seq_puts(s, "host\tchan\tid\tlun\ttype\topens\tqdepth\tbusy\tonline\n");
         return 0;
 }
 
-static int sg_proc_single_open_devhdr(struct inode *inode, struct file *file)
-{
-        return single_open(file, sg_proc_seq_show_devhdr, NULL);
-}
-
 struct sg_proc_deviter {
         loff_t  index;
         size_t  max;
@@ -2531,11 +2446,6 @@ static void dev_seq_stop(struct seq_file *s, void *v)
         kfree(s->private);
 }
 
-static int sg_proc_open_dev(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &dev_seq_ops);
-}
-
 static int sg_proc_seq_show_dev(struct seq_file *s, void *v)
 {
         struct sg_proc_deviter * it = (struct sg_proc_deviter *) v;
@@ -2562,11 +2472,6 @@ static int sg_proc_seq_show_dev(struct seq_file *s, void *v)
         return 0;
 }
 
-static int sg_proc_open_devstrs(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &devstrs_seq_ops);
-}
-
 static int sg_proc_seq_show_devstrs(struct seq_file *s, void *v)
 {
         struct sg_proc_deviter * it = (struct sg_proc_deviter *) v;
@@ -2650,11 +2555,6 @@ static void sg_proc_debug_helper(struct seq_file *s, Sg_device * sdp)
         }
 }
 
-static int sg_proc_open_debug(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &debug_seq_ops);
-}
-
 static int sg_proc_seq_show_debug(struct seq_file *s, void *v)
 {
         struct sg_proc_deviter * it = (struct sg_proc_deviter *) v;
diff --git a/drivers/staging/comedi/proc.c b/drivers/staging/comedi/proc.c
index 50d38938ac6f..8bc8e42beb90 100644
--- a/drivers/staging/comedi/proc.c
+++ b/drivers/staging/comedi/proc.c
@@ -62,25 +62,9 @@ static int comedi_read(struct seq_file *m, void *v)
         return 0;
 }
 
-/*
- * seq_file wrappers for procfile show routines.
- */
-static int comedi_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, comedi_read, NULL);
-}
-
-static const struct file_operations comedi_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = comedi_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 void __init comedi_proc_init(void)
 {
-        if (!proc_create("comedi", 0444, NULL, &comedi_proc_fops))
+        if (!proc_create_single("comedi", 0444, NULL, comedi_read))
                 pr_warn("comedi: unable to create proc entry\n");
 }
 
diff --git a/drivers/staging/fwserial/fwserial.c b/drivers/staging/fwserial/fwserial.c
index e8bfe5520bc7..fa0dd425b454 100644
--- a/drivers/staging/fwserial/fwserial.c
+++ b/drivers/staging/fwserial/fwserial.c
@@ -1506,11 +1506,6 @@ static int fwtty_debugfs_peers_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int fwtty_proc_open(struct inode *inode, struct file *fp)
-{
-        return single_open(fp, fwtty_proc_show, NULL);
-}
-
 static int fwtty_stats_open(struct inode *inode, struct file *fp)
 {
         return single_open(fp, fwtty_debugfs_stats_show, inode->i_private);
@@ -1537,14 +1532,6 @@ static const struct file_operations fwtty_peers_fops = {
         .release =      single_release,
 };
 
-static const struct file_operations fwtty_proc_fops = {
-        .owner =        THIS_MODULE,
-        .open =         fwtty_proc_open,
-        .read =         seq_read,
-        .llseek =       seq_lseek,
-        .release =      single_release,
-};
-
 static const struct tty_port_operations fwtty_port_ops = {
         .dtr_rts =              fwtty_port_dtr_rts,
         .carrier_raised =       fwtty_port_carrier_raised,
@@ -1570,7 +1557,7 @@ static const struct tty_operations fwtty_ops = {
         .tiocmget =             fwtty_tiocmget,
         .tiocmset =             fwtty_tiocmset,
         .get_icount =           fwtty_get_icount,
-        .proc_fops =            &fwtty_proc_fops,
+        .proc_show =            fwtty_proc_show,
 };
 
 static const struct tty_operations fwloop_ops = {
diff --git a/drivers/staging/ipx/ipx_proc.c b/drivers/staging/ipx/ipx_proc.c
index b9232e4e2ed4..360f0ad970de 100644
--- a/drivers/staging/ipx/ipx_proc.c
+++ b/drivers/staging/ipx/ipx_proc.c
@@ -244,42 +244,6 @@ static const struct seq_operations ipx_seq_socket_ops = {
         .show   = ipx_seq_socket_show,
 };
 
-static int ipx_seq_route_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &ipx_seq_route_ops);
-}
-
-static int ipx_seq_interface_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &ipx_seq_interface_ops);
-}
-
-static int ipx_seq_socket_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &ipx_seq_socket_ops);
-}
-
-static const struct file_operations ipx_seq_interface_fops = {
-        .open           = ipx_seq_interface_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release,
-};
-
-static const struct file_operations ipx_seq_route_fops = {
-        .open           = ipx_seq_route_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release,
-};
-
-static const struct file_operations ipx_seq_socket_fops = {
-        .open           = ipx_seq_socket_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release,
-};
-
 static struct proc_dir_entry *ipx_proc_dir;
 
 int __init ipx_proc_init(void)
@@ -291,16 +255,17 @@ int __init ipx_proc_init(void)
 
         if (!ipx_proc_dir)
                 goto out;
-        p = proc_create("interface", S_IRUGO,
-                        ipx_proc_dir, &ipx_seq_interface_fops);
+        p = proc_create_seq("interface", S_IRUGO, ipx_proc_dir,
+                        &ipx_seq_interface_ops);
         if (!p)
                 goto out_interface;
 
-        p = proc_create("route", S_IRUGO, ipx_proc_dir, &ipx_seq_route_fops);
+        p = proc_create_seq("route", S_IRUGO, ipx_proc_dir, &ipx_seq_route_ops);
         if (!p)
                 goto out_route;
 
-        p = proc_create("socket", S_IRUGO, ipx_proc_dir, &ipx_seq_socket_fops);
+        p = proc_create_seq("socket", S_IRUGO, ipx_proc_dir,
+                        &ipx_seq_socket_ops);
         if (!p)
                 goto out_socket;
 
diff --git a/drivers/staging/rtl8192u/r8192U_core.c b/drivers/staging/rtl8192u/r8192U_core.c
index d607c59761cf..7a0dbc0fa18e 100644
--- a/drivers/staging/rtl8192u/r8192U_core.c
+++ b/drivers/staging/rtl8192u/r8192U_core.c
@@ -646,64 +646,25 @@ static void rtl8192_proc_module_init(void)
         rtl8192_proc = proc_mkdir(RTL819xU_MODULE_NAME, init_net.proc_net);
 }
 
-/*
- * seq_file wrappers for procfile show routines.
- */
-static int rtl8192_proc_open(struct inode *inode, struct file *file)
-{
-        struct net_device *dev = proc_get_parent_data(inode);
-        int (*show)(struct seq_file *, void *) = PDE_DATA(inode);
-
-        return single_open(file, show, dev);
-}
-
-static const struct file_operations rtl8192_proc_fops = {
-        .open           = rtl8192_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
-/*
- * Table of proc files we need to create.
- */
-struct rtl8192_proc_file {
-        char name[12];
-        int (*show)(struct seq_file *, void *);
-};
-
-static const struct rtl8192_proc_file rtl8192_proc_files[] = {
-        { "stats-rx",   &proc_get_stats_rx },
-        { "stats-tx",   &proc_get_stats_tx },
-        { "stats-ap",   &proc_get_stats_ap },
-        { "registers",  &proc_get_registers },
-        { "" }
-};
-
 static void rtl8192_proc_init_one(struct net_device *dev)
 {
-        const struct rtl8192_proc_file *f;
         struct proc_dir_entry *dir;
 
-        if (rtl8192_proc) {
-                dir = proc_mkdir_data(dev->name, 0, rtl8192_proc, dev);
-                if (!dir) {
-                        RT_TRACE(COMP_ERR,
-                                 "Unable to initialize /proc/net/rtl8192/%s\n",
-                                 dev->name);
-                        return;
-                }
+        if (!rtl8192_proc)
+                return;
 
-                for (f = rtl8192_proc_files; f->name[0]; f++) {
-                        if (!proc_create_data(f->name, S_IFREG | S_IRUGO, dir,
-                                              &rtl8192_proc_fops, f->show)) {
-                                RT_TRACE(COMP_ERR,
-                                         "Unable to initialize /proc/net/rtl8192/%s/%s\n",
-                                         dev->name, f->name);
-                                return;
-                        }
-                }
-        }
+        dir = proc_mkdir_data(dev->name, 0, rtl8192_proc, dev);
+        if (!dir)
+                return;
+
+        proc_create_single("stats-rx", S_IFREG | S_IRUGO, dir,
+                        proc_get_stats_rx);
+        proc_create_single("stats-tx", S_IFREG | S_IRUGO, dir,
+                        proc_get_stats_tx);
+        proc_create_single("stats-ap", S_IFREG | S_IRUGO, dir,
+                        proc_get_stats_ap);
+        proc_create_single("registers", S_IFREG | S_IRUGO, dir,
+                        proc_get_registers);
 }
 
 static void rtl8192_proc_remove_one(struct net_device *dev)
diff --git a/drivers/tty/amiserial.c b/drivers/tty/amiserial.c
index 32d7ce430b02..34dead614149 100644
--- a/drivers/tty/amiserial.c
+++ b/drivers/tty/amiserial.c
@@ -1566,19 +1566,6 @@ static int rs_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int rs_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, rs_proc_show, NULL);
-}
-
-static const struct file_operations rs_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = rs_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 /*
  * ---------------------------------------------------------------------
  * rs_init() and friends
@@ -1620,7 +1607,7 @@ static const struct tty_operations serial_ops = {
         .tiocmget = rs_tiocmget,
         .tiocmset = rs_tiocmset,
         .get_icount = rs_get_icount,
-        .proc_fops = &rs_proc_fops,
+        .proc_show = rs_proc_show,
 };
 
 static int amiga_carrier_raised(struct tty_port *port)
diff --git a/drivers/tty/cyclades.c b/drivers/tty/cyclades.c
index cf0bde3bb927..6d3c58051ce3 100644
--- a/drivers/tty/cyclades.c
+++ b/drivers/tty/cyclades.c
@@ -3972,19 +3972,6 @@ static int cyclades_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int cyclades_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, cyclades_proc_show, NULL);
-}
-
-static const struct file_operations cyclades_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = cyclades_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 /* The serial driver boot-time initialization code!
     Hardware I/O ports are mapped to character special devices on a
     first found, first allocated manner.  That is, this code searches
@@ -4024,7 +4011,7 @@ static const struct tty_operations cy_ops = {
         .tiocmget = cy_tiocmget,
         .tiocmset = cy_tiocmset,
         .get_icount = cy_get_icount,
-        .proc_fops = &cyclades_proc_fops,
+        .proc_show = cyclades_proc_show,
 };
 
 static int __init cy_init(void)
diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
index 0466f9f08a91..6ff9405954a6 100644
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -1829,19 +1829,6 @@ static int uart_proc_show(struct seq_file *m, void *v)
                 uart_line_info(m, drv, i);
         return 0;
 }
-
-static int uart_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, uart_proc_show, PDE_DATA(inode));
-}
-
-static const struct file_operations uart_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = uart_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
 #endif
 
 #if defined(CONFIG_SERIAL_CORE_CONSOLE) || defined(CONFIG_CONSOLE_POLL)
@@ -2415,7 +2402,7 @@ static const struct tty_operations uart_ops = {
         .break_ctl      = uart_break_ctl,
         .wait_until_sent= uart_wait_until_sent,
 #ifdef CONFIG_PROC_FS
-        .proc_fops      = &uart_proc_fops,
+        .proc_show      = uart_proc_show,
 #endif
         .tiocmget       = uart_tiocmget,
         .tiocmset       = uart_tiocmset,
diff --git a/drivers/tty/synclink.c b/drivers/tty/synclink.c
index 3c4ad71f261d..fbdf4d01c6a9 100644
--- a/drivers/tty/synclink.c
+++ b/drivers/tty/synclink.c
@@ -3534,19 +3534,6 @@ static int mgsl_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int mgsl_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, mgsl_proc_show, NULL);
-}
-
-static const struct file_operations mgsl_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = mgsl_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 /* mgsl_allocate_dma_buffers()
  * 
  *      Allocate and format DMA buffers (ISA adapter)
@@ -4298,7 +4285,7 @@ static const struct tty_operations mgsl_ops = {
         .tiocmget = tiocmget,
         .tiocmset = tiocmset,
         .get_icount = msgl_get_icount,
-        .proc_fops = &mgsl_proc_fops,
+        .proc_show = mgsl_proc_show,
 };
 
 /*
diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c
index 255c49687877..a94086597ebd 100644
--- a/drivers/tty/synclink_gt.c
+++ b/drivers/tty/synclink_gt.c
@@ -1316,19 +1316,6 @@ static int synclink_gt_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int synclink_gt_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, synclink_gt_proc_show, NULL);
-}
-
-static const struct file_operations synclink_gt_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = synclink_gt_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 /*
  * return count of bytes in transmit buffer
  */
@@ -3721,7 +3708,7 @@ static const struct tty_operations ops = {
         .tiocmget = tiocmget,
         .tiocmset = tiocmset,
         .get_icount = get_icount,
-        .proc_fops = &synclink_gt_proc_fops,
+        .proc_show = synclink_gt_proc_show,
 };
 
 static void slgt_cleanup(void)
diff --git a/drivers/tty/synclinkmp.c b/drivers/tty/synclinkmp.c
index 75f11ce1f0a1..1e4d5b9c981a 100644
--- a/drivers/tty/synclinkmp.c
+++ b/drivers/tty/synclinkmp.c
@@ -1421,19 +1421,6 @@ static int synclinkmp_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int synclinkmp_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, synclinkmp_proc_show, NULL);
-}
-
-static const struct file_operations synclinkmp_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = synclinkmp_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 /* Return the count of bytes in transmit buffer
  */
 static int chars_in_buffer(struct tty_struct *tty)
@@ -3899,7 +3886,7 @@ static const struct tty_operations ops = {
         .tiocmget = tiocmget,
         .tiocmset = tiocmset,
         .get_icount = get_icount,
-        .proc_fops = &synclinkmp_proc_fops,
+        .proc_show = synclinkmp_proc_show,
 };
 
 
diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
index fb7329ab2b37..fc4c97cae01e 100644
--- a/drivers/tty/tty_ldisc.c
+++ b/drivers/tty/tty_ldisc.c
@@ -229,26 +229,13 @@ static int tty_ldiscs_seq_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static const struct seq_operations tty_ldiscs_seq_ops = {
+const struct seq_operations tty_ldiscs_seq_ops = {
         .start  = tty_ldiscs_seq_start,
         .next   = tty_ldiscs_seq_next,
         .stop   = tty_ldiscs_seq_stop,
         .show   = tty_ldiscs_seq_show,
 };
 
-static int proc_tty_ldiscs_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &tty_ldiscs_seq_ops);
-}
-
-const struct file_operations tty_ldiscs_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = proc_tty_ldiscs_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release,
-};
-
 /**
  *      tty_ldisc_ref_wait      -       wait for the tty ldisc
  *      @tty: tty device
diff --git a/drivers/usb/gadget/udc/at91_udc.c b/drivers/usb/gadget/udc/at91_udc.c
index ad743a8493be..03959dc86cfd 100644
--- a/drivers/usb/gadget/udc/at91_udc.c
+++ b/drivers/usb/gadget/udc/at91_udc.c
@@ -234,22 +234,10 @@ static int proc_udc_show(struct seq_file *s, void *unused)
         return 0;
 }
 
-static int proc_udc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, proc_udc_show, PDE_DATA(inode));
-}
-
-static const struct file_operations proc_ops = {
-        .owner          = THIS_MODULE,
-        .open           = proc_udc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static void create_debug_file(struct at91_udc *udc)
 {
-        udc->pde = proc_create_data(debug_filename, 0, NULL, &proc_ops, udc);
+        udc->pde = proc_create_single_data(debug_filename, 0, NULL,
+                        proc_udc_show, udc);
 }
 
 static void remove_debug_file(struct at91_udc *udc)
diff --git a/drivers/usb/gadget/udc/fsl_udc_core.c b/drivers/usb/gadget/udc/fsl_udc_core.c
index 56b517a38865..7d8af299dfc7 100644
--- a/drivers/usb/gadget/udc/fsl_udc_core.c
+++ b/drivers/usb/gadget/udc/fsl_udc_core.c
@@ -2207,22 +2207,8 @@ static int fsl_proc_read(struct seq_file *m, void *v)
         return 0;
 }
 
-/*
- * seq_file wrappers for procfile show routines.
- */
-static int fsl_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, fsl_proc_read, NULL);
-}
-
-static const struct file_operations fsl_proc_fops = {
-        .open           = fsl_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
-#define create_proc_file()      proc_create(proc_filename, 0, NULL, &fsl_proc_fops)
+#define create_proc_file() \
+        proc_create_single(proc_filename, 0, NULL, fsl_proc_read)
 #define remove_proc_file()      remove_proc_entry(proc_filename, NULL)
 
 #else                           /* !CONFIG_USB_GADGET_DEBUG_FILES */
diff --git a/drivers/usb/gadget/udc/goku_udc.c b/drivers/usb/gadget/udc/goku_udc.c
index 4504d0b202db..c3721225b61e 100644
--- a/drivers/usb/gadget/udc/goku_udc.c
+++ b/drivers/usb/gadget/udc/goku_udc.c
@@ -1241,22 +1241,6 @@ done:
         local_irq_restore(flags);
         return 0;
 }
-
-/*
- * seq_file wrappers for procfile show routines.
- */
-static int udc_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, udc_proc_read, PDE_DATA(file_inode(file)));
-}
-
-static const struct file_operations udc_proc_fops = {
-        .open           = udc_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 #endif  /* CONFIG_USB_GADGET_DEBUG_FILES */
 
 /*-------------------------------------------------------------------------*/
@@ -1826,7 +1810,7 @@ static int goku_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 
 
 #ifdef CONFIG_USB_GADGET_DEBUG_FILES
-        proc_create_data(proc_node_name, 0, NULL, &udc_proc_fops, dev);
+        proc_create_single_data(proc_node_name, 0, NULL, udc_proc_read, dev);
 #endif
 
         retval = usb_add_gadget_udc_release(&pdev->dev, &dev->gadget,
diff --git a/drivers/usb/gadget/udc/omap_udc.c b/drivers/usb/gadget/udc/omap_udc.c
index dc35a54bad90..3a16431da321 100644
--- a/drivers/usb/gadget/udc/omap_udc.c
+++ b/drivers/usb/gadget/udc/omap_udc.c
@@ -2432,22 +2432,9 @@ static int proc_udc_show(struct seq_file *s, void *_)
         return 0;
 }
 
-static int proc_udc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, proc_udc_show, NULL);
-}
-
-static const struct file_operations proc_ops = {
-        .owner          = THIS_MODULE,
-        .open           = proc_udc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static void create_proc_file(void)
 {
-        proc_create(proc_filename, 0, NULL, &proc_ops);
+        proc_create_single(proc_filename, 0, NULL, proc_udc_show);
 }
 
 static void remove_proc_file(void)
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index 790e0cbe3da9..268ffa6b51d2 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -476,19 +476,6 @@ static int serial_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int serial_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, serial_proc_show, NULL);
-}
-
-static const struct file_operations serial_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = serial_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static int serial_tiocmget(struct tty_struct *tty)
 {
         struct usb_serial_port *port = tty->driver_data;
@@ -1192,7 +1179,7 @@ static const struct tty_operations serial_ops = {
         .get_icount =           serial_get_icount,
         .cleanup =              serial_cleanup,
         .install =              serial_install,
-        .proc_fops =            &serial_proc_fops,
+        .proc_show =            serial_proc_show,
 };
 
 
diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c
index f741ba8df01b..924d0730ffe2 100644
--- a/drivers/video/fbdev/core/fbmem.c
+++ b/drivers/video/fbdev/core/fbmem.c
@@ -713,19 +713,6 @@ static const struct seq_operations proc_fb_seq_ops = {
         .show   = fb_seq_show,
 };
 
-static int proc_fb_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &proc_fb_seq_ops);
-}
-
-static const struct file_operations fb_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = proc_fb_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release,
-};
-
 /*
  * We hold a reference to the fb_info in file->private_data,
  * but if the current registered fb has changed, we don't
@@ -1877,7 +1864,7 @@ fbmem_init(void)
 {
         int ret;
 
-        if (!proc_create("fb", 0, NULL, &fb_proc_fops))
+        if (!proc_create_seq("fb", 0, NULL, &proc_fb_seq_ops))
                 return -ENOMEM;
 
         ret = register_chrdev(FB_MAJOR, "fb", &fb_fops);
diff --git a/drivers/video/fbdev/via/viafbdev.c b/drivers/video/fbdev/via/viafbdev.c
index badee04ef496..9b45125988fb 100644
--- a/drivers/video/fbdev/via/viafbdev.c
+++ b/drivers/video/fbdev/via/viafbdev.c
@@ -1475,19 +1475,6 @@ static int viafb_sup_odev_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int viafb_sup_odev_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, viafb_sup_odev_proc_show, NULL);
-}
-
-static const struct file_operations viafb_sup_odev_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = viafb_sup_odev_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static ssize_t odev_update(const char __user *buffer, size_t count, u32 *odev)
 {
         char buf[64], *ptr = buf;
@@ -1616,8 +1603,8 @@ static void viafb_init_proc(struct viafb_shared *shared)
                                 &viafb_vt1636_proc_fops);
 #endif /* CONFIG_FB_VIA_DIRECT_PROCFS */
 
-                proc_create("supported_output_devices", 0, viafb_entry,
-                        &viafb_sup_odev_proc_fops);
+                proc_create_single("supported_output_devices", 0, viafb_entry,
+                        viafb_sup_odev_proc_show);
                 iga1_entry = proc_mkdir("iga1", viafb_entry);
                 shared->iga1_proc_entry = iga1_entry;
                 proc_create("output_devices", 0, iga1_entry,
diff --git a/drivers/zorro/proc.c b/drivers/zorro/proc.c
index df05a26ab8d8..2e4ca4dc0960 100644
--- a/drivers/zorro/proc.c
+++ b/drivers/zorro/proc.c
@@ -96,19 +96,6 @@ static const struct seq_operations zorro_devices_seq_ops = {
         .show  = zorro_seq_show,
 };
 
-static int zorro_devices_proc_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &zorro_devices_seq_ops);
-}
-
-static const struct file_operations zorro_devices_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = zorro_devices_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release,
-};
-
 static struct proc_dir_entry *proc_bus_zorro_dir;
 
 static int __init zorro_proc_attach_device(unsigned int slot)
@@ -132,8 +119,8 @@ static int __init zorro_proc_init(void)
 
         if (MACH_IS_AMIGA && AMIGAHW_PRESENT(ZORRO)) {
                 proc_bus_zorro_dir = proc_mkdir("bus/zorro", NULL);
-                proc_create("devices", 0, proc_bus_zorro_dir,
-                            &zorro_devices_proc_fops);
+                proc_create_seq("devices", 0, proc_bus_zorro_dir,
+                            &zorro_devices_seq_ops);
                 for (slot = 0; slot < zorro_num_autocon; slot++)
                         zorro_proc_attach_device(slot);
         }
diff --git a/fs/afs/proc.c b/fs/afs/proc.c
index 839a22280606..3aad32762989 100644
--- a/fs/afs/proc.c
+++ b/fs/afs/proc.c
@@ -62,7 +62,6 @@ static const struct file_operations afs_proc_rootcell_fops = {
         .llseek         = no_llseek,
 };
 
-static int afs_proc_cell_volumes_open(struct inode *inode, struct file *file);
 static void *afs_proc_cell_volumes_start(struct seq_file *p, loff_t *pos);
 static void *afs_proc_cell_volumes_next(struct seq_file *p, void *v,
                                         loff_t *pos);
@@ -76,15 +75,6 @@ static const struct seq_operations afs_proc_cell_volumes_ops = {
         .show   = afs_proc_cell_volumes_show,
 };
 
-static const struct file_operations afs_proc_cell_volumes_fops = {
-        .open           = afs_proc_cell_volumes_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release,
-};
-
-static int afs_proc_cell_vlservers_open(struct inode *inode,
-                                        struct file *file);
 static void *afs_proc_cell_vlservers_start(struct seq_file *p, loff_t *pos);
 static void *afs_proc_cell_vlservers_next(struct seq_file *p, void *v,
                                           loff_t *pos);
@@ -98,14 +88,6 @@ static const struct seq_operations afs_proc_cell_vlservers_ops = {
         .show   = afs_proc_cell_vlservers_show,
 };
 
-static const struct file_operations afs_proc_cell_vlservers_fops = {
-        .open           = afs_proc_cell_vlservers_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release,
-};
-
-static int afs_proc_servers_open(struct inode *inode, struct file *file);
 static void *afs_proc_servers_start(struct seq_file *p, loff_t *pos);
 static void *afs_proc_servers_next(struct seq_file *p, void *v,
                                         loff_t *pos);
@@ -119,13 +101,6 @@ static const struct seq_operations afs_proc_servers_ops = {
         .show   = afs_proc_servers_show,
 };
 
-static const struct file_operations afs_proc_servers_fops = {
-        .open           = afs_proc_servers_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release,
-};
-
 static int afs_proc_sysname_open(struct inode *inode, struct file *file);
 static int afs_proc_sysname_release(struct inode *inode, struct file *file);
 static void *afs_proc_sysname_start(struct seq_file *p, loff_t *pos);
@@ -152,7 +127,7 @@ static const struct file_operations afs_proc_sysname_fops = {
         .write          = afs_proc_sysname_write,
 };
 
-static const struct file_operations afs_proc_stats_fops;
+static int afs_proc_stats_show(struct seq_file *m, void *v);
 
 /*
  * initialise the /proc/fs/afs/ directory
@@ -167,8 +142,8 @@ int afs_proc_init(struct afs_net *net)
 
         if (!proc_create("cells", 0644, net->proc_afs, &afs_proc_cells_fops) ||
             !proc_create("rootcell", 0644, net->proc_afs, &afs_proc_rootcell_fops) ||
-            !proc_create("servers", 0644, net->proc_afs, &afs_proc_servers_fops) ||
-            !proc_create("stats", 0644, net->proc_afs, &afs_proc_stats_fops) ||
+            !proc_create_seq("servers", 0644, net->proc_afs, &afs_proc_servers_ops) ||
+            !proc_create_single("stats", 0644, net->proc_afs, afs_proc_stats_show) ||
             !proc_create("sysname", 0644, net->proc_afs, &afs_proc_sysname_fops))
                 goto error_tree;
 
@@ -196,16 +171,7 @@ void afs_proc_cleanup(struct afs_net *net)
  */
 static int afs_proc_cells_open(struct inode *inode, struct file *file)
 {
-        struct seq_file *m;
-        int ret;
-
-        ret = seq_open(file, &afs_proc_cells_ops);
-        if (ret < 0)
-                return ret;
-
-        m = file->private_data;
-        m->private = PDE_DATA(inode);
-        return 0;
+        return seq_open(file, &afs_proc_cells_ops);
 }
 
 /*
@@ -430,10 +396,11 @@ int afs_proc_cell_setup(struct afs_net *net, struct afs_cell *cell)
         if (!dir)
                 goto error_dir;
 
-        if (!proc_create_data("vlservers", 0, dir,
-                              &afs_proc_cell_vlservers_fops, cell) ||
-            !proc_create_data("volumes", 0, dir,
-                              &afs_proc_cell_volumes_fops, cell))
+        if (!proc_create_seq_data("vlservers", 0, dir,
+                        &afs_proc_cell_vlservers_ops, cell))
+                goto error_tree;
+        if (!proc_create_seq_data("volumes", 0, dir, &afs_proc_cell_volumes_ops,
+                        cell))
                 goto error_tree;
 
         _leave(" = 0");
@@ -459,36 +426,13 @@ void afs_proc_cell_remove(struct afs_net *net, struct afs_cell *cell)
 }
 
 /*
- * open "/proc/fs/afs/<cell>/volumes" which provides a summary of extant cells
- */
-static int afs_proc_cell_volumes_open(struct inode *inode, struct file *file)
-{
-        struct afs_cell *cell;
-        struct seq_file *m;
-        int ret;
-
-        cell = PDE_DATA(inode);
-        if (!cell)
-                return -ENOENT;
-
-        ret = seq_open(file, &afs_proc_cell_volumes_ops);
-        if (ret < 0)
-                return ret;
-
-        m = file->private_data;
-        m->private = cell;
-
-        return 0;
-}
-
-/*
  * set up the iterator to start reading from the cells list and return the
  * first item
  */
 static void *afs_proc_cell_volumes_start(struct seq_file *m, loff_t *_pos)
         __acquires(cell->proc_lock)
 {
-        struct afs_cell *cell = m->private;
+        struct afs_cell *cell = PDE_DATA(file_inode(m->file));
 
         _enter("cell=%p pos=%Ld", cell, *_pos);
 
@@ -502,7 +446,7 @@ static void *afs_proc_cell_volumes_start(struct seq_file *m, loff_t *_pos)
 static void *afs_proc_cell_volumes_next(struct seq_file *p, void *v,
                                         loff_t *_pos)
 {
-        struct afs_cell *cell = p->private;
+        struct afs_cell *cell = PDE_DATA(file_inode(p->file));
 
         _enter("cell=%p pos=%Ld", cell, *_pos);
         return seq_list_next(v, &cell->proc_volumes, _pos);
@@ -514,7 +458,7 @@ static void *afs_proc_cell_volumes_next(struct seq_file *p, void *v,
 static void afs_proc_cell_volumes_stop(struct seq_file *p, void *v)
         __releases(cell->proc_lock)
 {
-        struct afs_cell *cell = p->private;
+        struct afs_cell *cell = PDE_DATA(file_inode(p->file));
 
         read_unlock(&cell->proc_lock);
 }
@@ -530,7 +474,7 @@ static const char afs_vol_types[3][3] = {
  */
 static int afs_proc_cell_volumes_show(struct seq_file *m, void *v)
 {
-        struct afs_cell *cell = m->private;
+        struct afs_cell *cell = PDE_DATA(file_inode(m->file));
         struct afs_volume *vol = list_entry(v, struct afs_volume, proc_link);
 
         /* Display header on line 1 */
@@ -547,30 +491,6 @@ static int afs_proc_cell_volumes_show(struct seq_file *m, void *v)
 }
 
 /*
- * open "/proc/fs/afs/<cell>/vlservers" which provides a list of volume
- * location server
- */
-static int afs_proc_cell_vlservers_open(struct inode *inode, struct file *file)
-{
-        struct afs_cell *cell;
-        struct seq_file *m;
-        int ret;
-
-        cell = PDE_DATA(inode);
-        if (!cell)
-                return -ENOENT;
-
-        ret = seq_open(file, &afs_proc_cell_vlservers_ops);
-        if (ret<0)
-                return ret;
-
-        m = file->private_data;
-        m->private = cell;
-
-        return 0;
-}
-
-/*
  * set up the iterator to start reading from the cells list and return the
  * first item
  */
@@ -578,7 +498,7 @@ static void *afs_proc_cell_vlservers_start(struct seq_file *m, loff_t *_pos)
         __acquires(rcu)
 {
         struct afs_addr_list *alist;
-        struct afs_cell *cell = m->private;
+        struct afs_cell *cell = PDE_DATA(file_inode(m->file));
         loff_t pos = *_pos;
 
         rcu_read_lock();
@@ -603,7 +523,7 @@ static void *afs_proc_cell_vlservers_next(struct seq_file *p, void *v,
                                           loff_t *_pos)
 {
         struct afs_addr_list *alist;
-        struct afs_cell *cell = p->private;
+        struct afs_cell *cell = PDE_DATA(file_inode(p->file));
         loff_t pos;
 
         alist = rcu_dereference(cell->vl_addrs);
@@ -644,15 +564,6 @@ static int afs_proc_cell_vlservers_show(struct seq_file *m, void *v)
 }
 
 /*
- * open "/proc/fs/afs/servers" which provides a summary of active
- * servers
- */
-static int afs_proc_servers_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &afs_proc_servers_ops);
-}
-
-/*
  * Set up the iterator to start reading from the server list and return the
  * first item.
  */
@@ -931,18 +842,3 @@ static int afs_proc_stats_show(struct seq_file *m, void *v)
                    atomic_long_read(&net->n_store_bytes));
         return 0;
 }
-
-/*
- * Open "/proc/fs/afs/stats" to allow reading of the stat counters.
- */
-static int afs_proc_stats_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, afs_proc_stats_show, NULL);
-}
-
-static const struct file_operations afs_proc_stats_fops = {
-        .open           = afs_proc_stats_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
diff --git a/fs/cachefiles/proc.c b/fs/cachefiles/proc.c
index 125b90f6c796..0ce1aa56b67f 100644
--- a/fs/cachefiles/proc.c
+++ b/fs/cachefiles/proc.c
@@ -85,21 +85,6 @@ static const struct seq_operations cachefiles_histogram_ops = {
 };
 
 /*
- * open "/proc/fs/cachefiles/XXX" which provide statistics summaries
- */
-static int cachefiles_histogram_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &cachefiles_histogram_ops);
-}
-
-static const struct file_operations cachefiles_histogram_fops = {
-        .open           = cachefiles_histogram_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release,
-};
-
-/*
  * initialise the /proc/fs/cachefiles/ directory
  */
 int __init cachefiles_proc_init(void)
@@ -109,8 +94,8 @@ int __init cachefiles_proc_init(void)
         if (!proc_mkdir("fs/cachefiles", NULL))
                 goto error_dir;
 
-        if (!proc_create("fs/cachefiles/histogram", S_IFREG | 0444, NULL,
-                         &cachefiles_histogram_fops))
+        if (!proc_create_seq("fs/cachefiles/histogram", S_IFREG | 0444, NULL,
+                         &cachefiles_histogram_ops))
                 goto error_histogram;
 
         _leave(" = 0");
diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
index 9d69ea433330..4bc4a7ac61d9 100644
--- a/fs/cifs/cifs_debug.c
+++ b/fs/cifs/cifs_debug.c
@@ -314,18 +314,6 @@ skip_rdma:
         return 0;
 }
 
-static int cifs_debug_data_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, cifs_debug_data_proc_show, NULL);
-}
-
-static const struct file_operations cifs_debug_data_proc_fops = {
-        .open           = cifs_debug_data_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 #ifdef CONFIG_CIFS_STATS
 static ssize_t cifs_stats_proc_write(struct file *file,
                 const char __user *buffer, size_t count, loff_t *ppos)
@@ -497,7 +485,8 @@ cifs_proc_init(void)
         if (proc_fs_cifs == NULL)
                 return;
 
-        proc_create("DebugData", 0, proc_fs_cifs, &cifs_debug_data_proc_fops);
+        proc_create_single("DebugData", 0, proc_fs_cifs,
+                        cifs_debug_data_proc_show);
 
 #ifdef CONFIG_CIFS_STATS
         proc_create("Stats", 0, proc_fs_cifs, &cifs_stats_proc_fops);
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index a42e71203e53..229ea4da6785 100644
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -2390,7 +2390,7 @@ extern int ext4_init_inode_table(struct super_block *sb,
 extern void ext4_end_bitmap_read(struct buffer_head *bh, int uptodate);
 
 /* mballoc.c */
-extern const struct file_operations ext4_seq_mb_groups_fops;
+extern const struct seq_operations ext4_mb_seq_groups_ops;
 extern long ext4_mb_stats;
 extern long ext4_mb_max_to_scan;
 extern int ext4_mb_init(struct super_block *);
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
index 769a62708b1c..6884e81c1465 100644
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
@@ -2254,7 +2254,7 @@ out:
 
 static void *ext4_mb_seq_groups_start(struct seq_file *seq, loff_t *pos)
 {
-        struct super_block *sb = seq->private;
+        struct super_block *sb = PDE_DATA(file_inode(seq->file));
         ext4_group_t group;
 
         if (*pos < 0 || *pos >= ext4_get_groups_count(sb))
@@ -2265,7 +2265,7 @@ static void *ext4_mb_seq_groups_start(struct seq_file *seq, loff_t *pos)
 
 static void *ext4_mb_seq_groups_next(struct seq_file *seq, void *v, loff_t *pos)
 {
-        struct super_block *sb = seq->private;
+        struct super_block *sb = PDE_DATA(file_inode(seq->file));
         ext4_group_t group;
 
         ++*pos;
@@ -2277,7 +2277,7 @@ static void *ext4_mb_seq_groups_next(struct seq_file *seq, void *v, loff_t *pos)
 
 static int ext4_mb_seq_groups_show(struct seq_file *seq, void *v)
 {
-        struct super_block *sb = seq->private;
+        struct super_block *sb = PDE_DATA(file_inode(seq->file));
         ext4_group_t group = (ext4_group_t) ((unsigned long) v);
         int i;
         int err, buddy_loaded = 0;
@@ -2330,34 +2330,13 @@ static void ext4_mb_seq_groups_stop(struct seq_file *seq, void *v)
 {
 }
 
-static const struct seq_operations ext4_mb_seq_groups_ops = {
+const struct seq_operations ext4_mb_seq_groups_ops = {
         .start  = ext4_mb_seq_groups_start,
         .next   = ext4_mb_seq_groups_next,
         .stop   = ext4_mb_seq_groups_stop,
         .show   = ext4_mb_seq_groups_show,
 };
 
-static int ext4_mb_seq_groups_open(struct inode *inode, struct file *file)
-{
-        struct super_block *sb = PDE_DATA(inode);
-        int rc;
-
-        rc = seq_open(file, &ext4_mb_seq_groups_ops);
-        if (rc == 0) {
-                struct seq_file *m = file->private_data;
-                m->private = sb;
-        }
-        return rc;
-
-}
-
-const struct file_operations ext4_seq_mb_groups_fops = {
-        .open           = ext4_mb_seq_groups_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release,
-};
-
 static struct kmem_cache *get_groupinfo_cache(int blocksize_bits)
 {
         int cache_index = blocksize_bits - EXT4_MIN_BLOCK_LOG_SIZE;
diff --git a/fs/ext4/sysfs.c b/fs/ext4/sysfs.c
index 9ebd26c957c2..f34da0bb8f17 100644
--- a/fs/ext4/sysfs.c
+++ b/fs/ext4/sysfs.c
@@ -346,39 +346,9 @@ static struct kobject *ext4_root;
 
 static struct kobject *ext4_feat;
 
-#define PROC_FILE_SHOW_DEFN(name) \
-static int name##_open(struct inode *inode, struct file *file) \
-{ \
-        return single_open(file, ext4_seq_##name##_show, PDE_DATA(inode)); \
-} \
-\
-static const struct file_operations ext4_seq_##name##_fops = { \
-        .open           = name##_open, \
-        .read           = seq_read, \
-        .llseek         = seq_lseek, \
-        .release        = single_release, \
-}
-
-#define PROC_FILE_LIST(name) \
-        { __stringify(name), &ext4_seq_##name##_fops }
-
-PROC_FILE_SHOW_DEFN(es_shrinker_info);
-PROC_FILE_SHOW_DEFN(options);
-
-static const struct ext4_proc_files {
-        const char *name;
-        const struct file_operations *fops;
-} proc_files[] = {
-        PROC_FILE_LIST(options),
-        PROC_FILE_LIST(es_shrinker_info),
-        PROC_FILE_LIST(mb_groups),
-        { NULL, NULL },
-};
-
 int ext4_register_sysfs(struct super_block *sb)
 {
         struct ext4_sb_info *sbi = EXT4_SB(sb);
-        const struct ext4_proc_files *p;
         int err;
 
         init_completion(&sbi->s_kobj_unregister);
@@ -392,11 +362,14 @@ int ext4_register_sysfs(struct super_block *sb)
 
         if (ext4_proc_root)
                 sbi->s_proc = proc_mkdir(sb->s_id, ext4_proc_root);
-
         if (sbi->s_proc) {
-                for (p = proc_files; p->name; p++)
-                        proc_create_data(p->name, S_IRUGO, sbi->s_proc,
-                                         p->fops, sb);
+                proc_create_single_data("options", S_IRUGO, sbi->s_proc,
+                                ext4_seq_options_show, sb);
+                proc_create_single_data("es_shrinker_info", S_IRUGO,
+                                sbi->s_proc, ext4_seq_es_shrinker_info_show,
+                                sb);
+                proc_create_seq_data("mb_groups", S_IRUGO, sbi->s_proc,
+                                &ext4_mb_seq_groups_ops, sb);
         }
         return 0;
 }
@@ -404,13 +377,9 @@ int ext4_register_sysfs(struct super_block *sb)
 void ext4_unregister_sysfs(struct super_block *sb)
 {
         struct ext4_sb_info *sbi = EXT4_SB(sb);
-        const struct ext4_proc_files *p;
 
-        if (sbi->s_proc) {
-                for (p = proc_files; p->name; p++)
-                        remove_proc_entry(p->name, sbi->s_proc);
-                remove_proc_entry(sb->s_id, ext4_proc_root);
-        }
+        if (sbi->s_proc)
+                remove_proc_subtree(sb->s_id, ext4_proc_root);
         kobject_del(&sbi->s_kobj);
 }
 
diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c
index f33a56d6e6dd..4b47ca6296a7 100644
--- a/fs/f2fs/sysfs.c
+++ b/fs/f2fs/sysfs.c
@@ -572,23 +572,6 @@ static int iostat_info_seq_show(struct seq_file *seq, void *offset)
         return 0;
 }
 
-#define F2FS_PROC_FILE_DEF(_name)                                       \
-static int _name##_open_fs(struct inode *inode, struct file *file)      \
-{                                                                       \
-        return single_open(file, _name##_seq_show, PDE_DATA(inode));    \
-}                                                                       \
-                                                                        \
-static const struct file_operations f2fs_seq_##_name##_fops = {         \
-        .open = _name##_open_fs,                                        \
-        .read = seq_read,                                               \
-        .llseek = seq_lseek,                                            \
-        .release = single_release,                                      \
-};
-
-F2FS_PROC_FILE_DEF(segment_info);
-F2FS_PROC_FILE_DEF(segment_bits);
-F2FS_PROC_FILE_DEF(iostat_info);
-
 int __init f2fs_init_sysfs(void)
 {
         int ret;
@@ -632,12 +615,12 @@ int f2fs_register_sysfs(struct f2fs_sb_info *sbi)
                 sbi->s_proc = proc_mkdir(sb->s_id, f2fs_proc_root);
 
         if (sbi->s_proc) {
-                proc_create_data("segment_info", S_IRUGO, sbi->s_proc,
-                                 &f2fs_seq_segment_info_fops, sb);
-                proc_create_data("segment_bits", S_IRUGO, sbi->s_proc,
-                                 &f2fs_seq_segment_bits_fops, sb);
-                proc_create_data("iostat_info", S_IRUGO, sbi->s_proc,
-                                &f2fs_seq_iostat_info_fops, sb);
+                proc_create_single_data("segment_info", S_IRUGO, sbi->s_proc,
+                                segment_info_seq_show, sb);
+                proc_create_single_data("segment_bits", S_IRUGO, sbi->s_proc,
+                                segment_bits_seq_show, sb);
+                proc_create_single_data("iostat_info", S_IRUGO, sbi->s_proc,
+                                iostat_info_seq_show, sb);
         }
         return 0;
 }
diff --git a/fs/filesystems.c b/fs/filesystems.c
index f2728a4a03a1..b03f57b1105b 100644
--- a/fs/filesystems.c
+++ b/fs/filesystems.c
@@ -238,21 +238,9 @@ static int filesystems_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int filesystems_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, filesystems_proc_show, NULL);
-}
-
-static const struct file_operations filesystems_proc_fops = {
-        .open           = filesystems_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static int __init proc_filesystems_init(void)
 {
-        proc_create("filesystems", 0, NULL, &filesystems_proc_fops);
+        proc_create_single("filesystems", 0, NULL, filesystems_proc_show);
         return 0;
 }
 module_init(proc_filesystems_init);
diff --git a/fs/fscache/histogram.c b/fs/fscache/histogram.c
index 15a3d042247e..9a13e9e15b69 100644
--- a/fs/fscache/histogram.c
+++ b/fs/fscache/histogram.c
@@ -83,24 +83,9 @@ static void fscache_histogram_stop(struct seq_file *m, void *v)
 {
 }
 
-static const struct seq_operations fscache_histogram_ops = {
+const struct seq_operations fscache_histogram_ops = {
         .start          = fscache_histogram_start,
         .stop           = fscache_histogram_stop,
         .next           = fscache_histogram_next,
         .show           = fscache_histogram_show,
 };
-
-/*
- * open "/proc/fs/fscache/histogram" to provide latency data
- */
-static int fscache_histogram_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &fscache_histogram_ops);
-}
-
-const struct file_operations fscache_histogram_fops = {
-        .open           = fscache_histogram_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release,
-};
diff --git a/fs/fscache/internal.h b/fs/fscache/internal.h
index 500650f938fe..f83328a7f048 100644
--- a/fs/fscache/internal.h
+++ b/fs/fscache/internal.h
@@ -31,6 +31,7 @@
 #include <linux/fscache-cache.h>
 #include <trace/events/fscache.h>
 #include <linux/sched.h>
+#include <linux/seq_file.h>
 
 #define FSCACHE_MIN_THREADS     4
 #define FSCACHE_MAX_THREADS     32
@@ -84,7 +85,7 @@ static inline void fscache_hist(atomic_t histogram[], unsigned long start_jif)
         atomic_inc(&histogram[jif]);
 }
 
-extern const struct file_operations fscache_histogram_fops;
+extern const struct seq_operations fscache_histogram_ops;
 
 #else
 #define fscache_hist(hist, start_jif) do {} while (0)
@@ -294,7 +295,7 @@ static inline void fscache_stat_d(atomic_t *stat)
 
 #define __fscache_stat(stat) (stat)
 
-extern const struct file_operations fscache_stats_fops;
+int fscache_stats_show(struct seq_file *m, void *v);
 #else
 
 #define __fscache_stat(stat) (NULL)
diff --git a/fs/fscache/proc.c b/fs/fscache/proc.c
index 1d9e4951a597..49a8c90414bc 100644
--- a/fs/fscache/proc.c
+++ b/fs/fscache/proc.c
@@ -26,14 +26,14 @@ int __init fscache_proc_init(void)
                 goto error_dir;
 
 #ifdef CONFIG_FSCACHE_STATS
-        if (!proc_create("fs/fscache/stats", S_IFREG | 0444, NULL,
-                         &fscache_stats_fops))
+        if (!proc_create_single("fs/fscache/stats", S_IFREG | 0444, NULL,
+                        fscache_stats_show))
                 goto error_stats;
 #endif
 
 #ifdef CONFIG_FSCACHE_HISTOGRAM
-        if (!proc_create("fs/fscache/histogram", S_IFREG | 0444, NULL,
-                         &fscache_histogram_fops))
+        if (!proc_create_seq("fs/fscache/histogram", S_IFREG | 0444, NULL,
+                         &fscache_histogram_ops))
                 goto error_histogram;
 #endif
 
diff --git a/fs/fscache/stats.c b/fs/fscache/stats.c
index fcc8c2f2690e..00564a1dfd76 100644
--- a/fs/fscache/stats.c
+++ b/fs/fscache/stats.c
@@ -138,7 +138,7 @@ atomic_t fscache_n_cache_culled_objects;
 /*
  * display the general statistics
  */
-static int fscache_stats_show(struct seq_file *m, void *v)
+int fscache_stats_show(struct seq_file *m, void *v)
 {
         seq_puts(m, "FS-Cache statistics\n");
 
@@ -284,18 +284,3 @@ static int fscache_stats_show(struct seq_file *m, void *v)
                    atomic_read(&fscache_n_cache_culled_objects));
         return 0;
 }
-
-/*
- * open "/proc/fs/fscache/stats" allowing provision of a statistical summary
- */
-static int fscache_stats_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, fscache_stats_show, NULL);
-}
-
-const struct file_operations fscache_stats_fops = {
-        .open           = fscache_stats_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
diff --git a/fs/jfs/jfs_debug.c b/fs/jfs/jfs_debug.c
index a70907606025..35a5b2a81ae0 100644
--- a/fs/jfs/jfs_debug.c
+++ b/fs/jfs/jfs_debug.c
@@ -29,7 +29,6 @@
 
 #ifdef PROC_FS_JFS /* see jfs_debug.h */
 
-static struct proc_dir_entry *base;
 #ifdef CONFIG_JFS_DEBUG
 static int jfs_loglevel_proc_show(struct seq_file *m, void *v)
 {
@@ -66,43 +65,29 @@ static const struct file_operations jfs_loglevel_proc_fops = {
 };
 #endif
 
-static struct {
-        const char      *name;
-        const struct file_operations *proc_fops;
-} Entries[] = {
-#ifdef CONFIG_JFS_STATISTICS
-        { "lmstats",    &jfs_lmstats_proc_fops, },
-        { "txstats",    &jfs_txstats_proc_fops, },
-        { "xtstat",     &jfs_xtstat_proc_fops, },
-        { "mpstat",     &jfs_mpstat_proc_fops, },
-#endif
-#ifdef CONFIG_JFS_DEBUG
-        { "TxAnchor",   &jfs_txanchor_proc_fops, },
-        { "loglevel",   &jfs_loglevel_proc_fops }
-#endif
-};
-#define NPROCENT        ARRAY_SIZE(Entries)
-
 void jfs_proc_init(void)
 {
-        int i;
+        struct proc_dir_entry *base;
 
-        if (!(base = proc_mkdir("fs/jfs", NULL)))
+        base = proc_mkdir("fs/jfs", NULL);
+        if (!base)
                 return;
 
-        for (i = 0; i < NPROCENT; i++)
-                proc_create(Entries[i].name, 0, base, Entries[i].proc_fops);
+#ifdef CONFIG_JFS_STATISTICS
+        proc_create_single("lmstats", 0, base, jfs_lmstats_proc_show);
+        proc_create_single("txstats", 0, base, jfs_txstats_proc_show);
+        proc_create_single("xtstat", 0, base, jfs_xtstat_proc_show);
+        proc_create_single("mpstat", 0, base, jfs_mpstat_proc_show);
+#endif
+#ifdef CONFIG_JFS_DEBUG
+        proc_create_single("TxAnchor", 0, base, jfs_txanchor_proc_show);
+        proc_create("loglevel", 0, base, &jfs_loglevel_proc_fops);
+#endif
 }
 
 void jfs_proc_clean(void)
 {
-        int i;
-
-        if (base) {
-                for (i = 0; i < NPROCENT; i++)
-                        remove_proc_entry(Entries[i].name, base);
-                remove_proc_entry("fs/jfs", NULL);
-        }
+        remove_proc_subtree("fs/jfs", NULL);
 }
 
 #endif /* PROC_FS_JFS */
diff --git a/fs/jfs/jfs_debug.h b/fs/jfs/jfs_debug.h
index eafd1300a00b..0d9e35da8462 100644
--- a/fs/jfs/jfs_debug.h
+++ b/fs/jfs/jfs_debug.h
@@ -62,7 +62,7 @@ extern void jfs_proc_clean(void);
 
 extern int jfsloglevel;
 
-extern const struct file_operations jfs_txanchor_proc_fops;
+int jfs_txanchor_proc_show(struct seq_file *m, void *v);
 
 /* information message: e.g., configuration, major event */
 #define jfs_info(fmt, arg...) do {                      \
@@ -105,10 +105,10 @@ extern const struct file_operations jfs_txanchor_proc_fops;
  *      ----------
  */
 #ifdef  CONFIG_JFS_STATISTICS
-extern const struct file_operations jfs_lmstats_proc_fops;
-extern const struct file_operations jfs_txstats_proc_fops;
-extern const struct file_operations jfs_mpstat_proc_fops;
-extern const struct file_operations jfs_xtstat_proc_fops;
+int jfs_lmstats_proc_show(struct seq_file *m, void *v);
+int jfs_txstats_proc_show(struct seq_file *m, void *v);
+int jfs_mpstat_proc_show(struct seq_file *m, void *v);
+int jfs_xtstat_proc_show(struct seq_file *m, void *v);
 
 #define INCREMENT(x)            ((x)++)
 #define DECREMENT(x)            ((x)--)
diff --git a/fs/jfs/jfs_logmgr.c b/fs/jfs/jfs_logmgr.c
index 0e5d412c0b01..6b68df395892 100644
--- a/fs/jfs/jfs_logmgr.c
+++ b/fs/jfs/jfs_logmgr.c
@@ -2493,7 +2493,7 @@ exit:
 }
 
 #ifdef CONFIG_JFS_STATISTICS
-static int jfs_lmstats_proc_show(struct seq_file *m, void *v)
+int jfs_lmstats_proc_show(struct seq_file *m, void *v)
 {
         seq_printf(m,
                        "JFS Logmgr stats\n"
@@ -2510,16 +2510,4 @@ static int jfs_lmstats_proc_show(struct seq_file *m, void *v)
                        lmStat.partial_page);
         return 0;
 }
-
-static int jfs_lmstats_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, jfs_lmstats_proc_show, NULL);
-}
-
-const struct file_operations jfs_lmstats_proc_fops = {
-        .open           = jfs_lmstats_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
 #endif /* CONFIG_JFS_STATISTICS */
diff --git a/fs/jfs/jfs_metapage.c b/fs/jfs/jfs_metapage.c
index 1a3b0cc22ad3..fa2c6824c7f2 100644
--- a/fs/jfs/jfs_metapage.c
+++ b/fs/jfs/jfs_metapage.c
@@ -815,7 +815,7 @@ void __invalidate_metapages(struct inode *ip, s64 addr, int len)
 }
 
 #ifdef CONFIG_JFS_STATISTICS
-static int jfs_mpstat_proc_show(struct seq_file *m, void *v)
+int jfs_mpstat_proc_show(struct seq_file *m, void *v)
 {
         seq_printf(m,
                        "JFS Metapage statistics\n"
@@ -828,16 +828,4 @@ static int jfs_mpstat_proc_show(struct seq_file *m, void *v)
                        mpStat.lockwait);
         return 0;
 }
-
-static int jfs_mpstat_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, jfs_mpstat_proc_show, NULL);
-}
-
-const struct file_operations jfs_mpstat_proc_fops = {
-        .open           = jfs_mpstat_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
 #endif
diff --git a/fs/jfs/jfs_txnmgr.c b/fs/jfs/jfs_txnmgr.c
index 4d973524c887..a5663cb621d8 100644
--- a/fs/jfs/jfs_txnmgr.c
+++ b/fs/jfs/jfs_txnmgr.c
@@ -2998,7 +2998,7 @@ int jfs_sync(void *arg)
 }
 
 #if defined(CONFIG_PROC_FS) && defined(CONFIG_JFS_DEBUG)
-static int jfs_txanchor_proc_show(struct seq_file *m, void *v)
+int jfs_txanchor_proc_show(struct seq_file *m, void *v)
 {
         char *freewait;
         char *freelockwait;
@@ -3032,22 +3032,10 @@ static int jfs_txanchor_proc_show(struct seq_file *m, void *v)
                        list_empty(&TxAnchor.unlock_queue) ? "" : "not ");
         return 0;
 }
-
-static int jfs_txanchor_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, jfs_txanchor_proc_show, NULL);
-}
-
-const struct file_operations jfs_txanchor_proc_fops = {
-        .open           = jfs_txanchor_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
 #endif
 
 #if defined(CONFIG_PROC_FS) && defined(CONFIG_JFS_STATISTICS)
-static int jfs_txstats_proc_show(struct seq_file *m, void *v)
+int jfs_txstats_proc_show(struct seq_file *m, void *v)
 {
         seq_printf(m,
                        "JFS TxStats\n"
@@ -3072,16 +3060,4 @@ static int jfs_txstats_proc_show(struct seq_file *m, void *v)
                        TxStat.txLockAlloc_freelock);
         return 0;
 }
-
-static int jfs_txstats_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, jfs_txstats_proc_show, NULL);
-}
-
-const struct file_operations jfs_txstats_proc_fops = {
-        .open           = jfs_txstats_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
 #endif
diff --git a/fs/jfs/jfs_xtree.c b/fs/jfs/jfs_xtree.c
index 5cde6d2fcfca..2c200b5256a6 100644
--- a/fs/jfs/jfs_xtree.c
+++ b/fs/jfs/jfs_xtree.c
@@ -3874,7 +3874,7 @@ s64 xtTruncate_pmap(tid_t tid, struct inode *ip, s64 committed_size)
 }
 
 #ifdef CONFIG_JFS_STATISTICS
-static int jfs_xtstat_proc_show(struct seq_file *m, void *v)
+int jfs_xtstat_proc_show(struct seq_file *m, void *v)
 {
         seq_printf(m,
                        "JFS Xtree statistics\n"
@@ -3887,16 +3887,4 @@ static int jfs_xtstat_proc_show(struct seq_file *m, void *v)
                        xtStat.split);
         return 0;
 }
-
-static int jfs_xtstat_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, jfs_xtstat_proc_show, NULL);
-}
-
-const struct file_operations jfs_xtstat_proc_fops = {
-        .open           = jfs_xtstat_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
 #endif
diff --git a/fs/locks.c b/fs/locks.c
index 62bbe8b31f26..05e211be8684 100644
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -2788,22 +2788,10 @@ static const struct seq_operations locks_seq_operations = {
         .show   = locks_show,
 };
 
-static int locks_open(struct inode *inode, struct file *filp)
-{
-        return seq_open_private(filp, &locks_seq_operations,
-                                        sizeof(struct locks_iterator));
-}
-
-static const struct file_operations proc_locks_operations = {
-        .open           = locks_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release_private,
-};
-
 static int __init proc_locks_init(void)
 {
-        proc_create("locks", 0, NULL, &proc_locks_operations);
+        proc_create_seq_private("locks", 0, NULL, &locks_seq_operations,
+                        sizeof(struct locks_iterator), NULL);
         return 0;
 }
 fs_initcall(proc_locks_init);
diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index b9129e2befea..bbc91d7ca1bd 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -1067,7 +1067,6 @@ void nfs_clients_init(struct net *net)
 }
 
 #ifdef CONFIG_PROC_FS
-static int nfs_server_list_open(struct inode *inode, struct file *file);
 static void *nfs_server_list_start(struct seq_file *p, loff_t *pos);
 static void *nfs_server_list_next(struct seq_file *p, void *v, loff_t *pos);
 static void nfs_server_list_stop(struct seq_file *p, void *v);
@@ -1080,14 +1079,6 @@ static const struct seq_operations nfs_server_list_ops = {
         .show   = nfs_server_list_show,
 };
 
-static const struct file_operations nfs_server_list_fops = {
-        .open           = nfs_server_list_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release_net,
-};
-
-static int nfs_volume_list_open(struct inode *inode, struct file *file);
 static void *nfs_volume_list_start(struct seq_file *p, loff_t *pos);
 static void *nfs_volume_list_next(struct seq_file *p, void *v, loff_t *pos);
 static void nfs_volume_list_stop(struct seq_file *p, void *v);
@@ -1100,23 +1091,6 @@ static const struct seq_operations nfs_volume_list_ops = {
         .show   = nfs_volume_list_show,
 };
 
-static const struct file_operations nfs_volume_list_fops = {
-        .open           = nfs_volume_list_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release_net,
-};
-
-/*
- * open "/proc/fs/nfsfs/servers" which provides a summary of servers with which
- * we're dealing
- */
-static int nfs_server_list_open(struct inode *inode, struct file *file)
-{
-        return seq_open_net(inode, file, &nfs_server_list_ops,
-                           sizeof(struct seq_net_private));
-}
-
 /*
  * set up the iterator to start reading from the server list and return the first item
  */
@@ -1185,15 +1159,6 @@ static int nfs_server_list_show(struct seq_file *m, void *v)
 }
 
 /*
- * open "/proc/fs/nfsfs/volumes" which provides a summary of extant volumes
- */
-static int nfs_volume_list_open(struct inode *inode, struct file *file)
-{
-        return seq_open_net(inode, file, &nfs_volume_list_ops,
-                           sizeof(struct seq_net_private));
-}
-
-/*
  * set up the iterator to start reading from the volume list and return the first item
  */
 static void *nfs_volume_list_start(struct seq_file *m, loff_t *_pos)
@@ -1278,14 +1243,14 @@ int nfs_fs_proc_net_init(struct net *net)
                 goto error_0;
 
         /* a file of servers with which we're dealing */
-        p = proc_create("servers", S_IFREG|S_IRUGO,
-                        nn->proc_nfsfs, &nfs_server_list_fops);
+        p = proc_create_net("servers", S_IFREG|S_IRUGO, nn->proc_nfsfs,
+                        &nfs_server_list_ops, sizeof(struct seq_net_private));
         if (!p)
                 goto error_1;
 
         /* a file of volumes that we have mounted */
-        p = proc_create("volumes", S_IFREG|S_IRUGO,
-                        nn->proc_nfsfs, &nfs_volume_list_fops);
+        p = proc_create_net("volumes", S_IFREG|S_IRUGO, nn->proc_nfsfs,
+                        &nfs_volume_list_ops, sizeof(struct seq_net_private));
         if (!p)
                 goto error_1;
         return 0;
diff --git a/fs/proc/array.c b/fs/proc/array.c
index 72391b3f6927..e6d7f41b6684 100644
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
@@ -702,25 +702,22 @@ out:
 
 static int children_seq_show(struct seq_file *seq, void *v)
 {
-        struct inode *inode = seq->private;
-        pid_t pid;
-
-        pid = pid_nr_ns(v, inode->i_sb->s_fs_info);
-        seq_printf(seq, "%d ", pid);
+        struct inode *inode = file_inode(seq->file);
 
+        seq_printf(seq, "%d ", pid_nr_ns(v, proc_pid_ns(inode)));
         return 0;
 }
 
 static void *children_seq_start(struct seq_file *seq, loff_t *pos)
 {
-        return get_children_pid(seq->private, NULL, *pos);
+        return get_children_pid(file_inode(seq->file), NULL, *pos);
 }
 
 static void *children_seq_next(struct seq_file *seq, void *v, loff_t *pos)
 {
         struct pid *pid;
 
-        pid = get_children_pid(seq->private, v, *pos + 1);
+        pid = get_children_pid(file_inode(seq->file), v, *pos + 1);
         put_pid(v);
 
         ++*pos;
@@ -741,17 +738,7 @@ static const struct seq_operations children_seq_ops = {
 
 static int children_seq_open(struct inode *inode, struct file *file)
 {
-        struct seq_file *m;
-        int ret;
-
-        ret = seq_open(file, &children_seq_ops);
-        if (ret)
-                return ret;
-
-        m = file->private_data;
-        m->private = inode;
-
-        return ret;
+        return seq_open(file, &children_seq_ops);
 }
 
 const struct file_operations proc_tid_children_operations = {
diff --git a/fs/proc/base.c b/fs/proc/base.c
index 1a76d751cf3c..4e35593546b1 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -698,7 +698,7 @@ static bool has_pid_permissions(struct pid_namespace *pid,
 
 static int proc_pid_permission(struct inode *inode, int mask)
 {
-        struct pid_namespace *pid = inode->i_sb->s_fs_info;
+        struct pid_namespace *pid = proc_pid_ns(inode);
         struct task_struct *task;
         bool has_perms;
 
@@ -733,13 +733,11 @@ static const struct inode_operations proc_def_inode_operations = {
 static int proc_single_show(struct seq_file *m, void *v)
 {
         struct inode *inode = m->private;
-        struct pid_namespace *ns;
-        struct pid *pid;
+        struct pid_namespace *ns = proc_pid_ns(inode);
+        struct pid *pid = proc_pid(inode);
         struct task_struct *task;
         int ret;
 
-        ns = inode->i_sb->s_fs_info;
-        pid = proc_pid(inode);
         task = get_pid_task(pid, PIDTYPE_PID);
         if (!task)
                 return -ESRCH;
@@ -1410,7 +1408,7 @@ static const struct file_operations proc_fail_nth_operations = {
 static int sched_show(struct seq_file *m, void *v)
 {
         struct inode *inode = m->private;
-        struct pid_namespace *ns = inode->i_sb->s_fs_info;
+        struct pid_namespace *ns = proc_pid_ns(inode);
         struct task_struct *p;
 
         p = get_proc_task(inode);
@@ -1782,8 +1780,8 @@ int pid_getattr(const struct path *path, struct kstat *stat,
                 u32 request_mask, unsigned int query_flags)
 {
         struct inode *inode = d_inode(path->dentry);
+        struct pid_namespace *pid = proc_pid_ns(inode);
         struct task_struct *task;
-        struct pid_namespace *pid = path->dentry->d_sb->s_fs_info;
 
         generic_fillattr(inode, stat);
 
@@ -2337,7 +2335,7 @@ static int proc_timers_open(struct inode *inode, struct file *file)
                 return -ENOMEM;
 
         tp->pid = proc_pid(inode);
-        tp->ns = inode->i_sb->s_fs_info;
+        tp->ns = proc_pid_ns(inode);
         return 0;
 }
 
@@ -3239,7 +3237,7 @@ retry:
 int proc_pid_readdir(struct file *file, struct dir_context *ctx)
 {
         struct tgid_iter iter;
-        struct pid_namespace *ns = file_inode(file)->i_sb->s_fs_info;
+        struct pid_namespace *ns = proc_pid_ns(file_inode(file));
         loff_t pos = ctx->pos;
 
         if (pos >= PID_MAX_LIMIT + TGID_OFFSET)
@@ -3588,7 +3586,7 @@ static int proc_task_readdir(struct file *file, struct dir_context *ctx)
         /* f_version caches the tgid value that the last readdir call couldn't
          * return. lseek aka telldir automagically resets f_version to 0.
          */
-        ns = inode->i_sb->s_fs_info;
+        ns = proc_pid_ns(inode);
         tid = (int)file->f_version;
         file->f_version = 0;
         for (task = first_tid(proc_pid(inode), tid, ctx->pos - 2, ns);
diff --git a/fs/proc/cmdline.c b/fs/proc/cmdline.c
index 8233e7af9389..fa762c5fbcb2 100644
--- a/fs/proc/cmdline.c
+++ b/fs/proc/cmdline.c
@@ -11,21 +11,9 @@ static int cmdline_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int cmdline_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, cmdline_proc_show, NULL);
-}
-
-static const struct file_operations cmdline_proc_fops = {
-        .open           = cmdline_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static int __init proc_cmdline_init(void)
 {
-        proc_create("cmdline", 0, NULL, &cmdline_proc_fops);
+        proc_create_single("cmdline", 0, NULL, cmdline_proc_show);
         return 0;
 }
 fs_initcall(proc_cmdline_init);
diff --git a/fs/proc/consoles.c b/fs/proc/consoles.c
index a8ac48aebd59..954caf0b7fee 100644
--- a/fs/proc/consoles.c
+++ b/fs/proc/consoles.c
@@ -91,21 +91,9 @@ static const struct seq_operations consoles_op = {
         .show   = show_console_dev
 };
 
-static int consoles_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &consoles_op);
-}
-
-static const struct file_operations proc_consoles_operations = {
-        .open           = consoles_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release,
-};
-
 static int __init proc_consoles_init(void)
 {
-        proc_create("consoles", 0, NULL, &proc_consoles_operations);
+        proc_create_seq("consoles", 0, NULL, &consoles_op);
         return 0;
 }
 fs_initcall(proc_consoles_init);
diff --git a/fs/proc/devices.c b/fs/proc/devices.c
index 2c7f22b14489..37d38697eaf8 100644
--- a/fs/proc/devices.c
+++ b/fs/proc/devices.c
@@ -51,21 +51,9 @@ static const struct seq_operations devinfo_ops = {
         .show  = devinfo_show
 };
 
-static int devinfo_open(struct inode *inode, struct file *filp)
-{
-        return seq_open(filp, &devinfo_ops);
-}
-
-static const struct file_operations proc_devinfo_operations = {
-        .open           = devinfo_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release,
-};
-
 static int __init proc_devices_init(void)
 {
-        proc_create("devices", 0, NULL, &proc_devinfo_operations);
+        proc_create_seq("devices", 0, NULL, &devinfo_ops);
         return 0;
 }
 fs_initcall(proc_devices_init);
diff --git a/fs/proc/generic.c b/fs/proc/generic.c
index 2078e70e1595..02bb1914f5f7 100644
--- a/fs/proc/generic.c
+++ b/fs/proc/generic.c
@@ -25,6 +25,7 @@
 #include <linux/spinlock.h>
 #include <linux/completion.h>
 #include <linux/uaccess.h>
+#include <linux/seq_file.h>
 
 #include "internal.h"
 
@@ -346,13 +347,12 @@ static const struct inode_operations proc_dir_inode_operations = {
         .setattr        = proc_notify_change,
 };
 
-static int proc_register(struct proc_dir_entry * dir, struct proc_dir_entry * dp)
+/* returns the registered entry, or frees dp and returns NULL on failure */
+struct proc_dir_entry *proc_register(struct proc_dir_entry *dir,
+                struct proc_dir_entry *dp)
 {
-        int ret;
-
-        ret = proc_alloc_inum(&dp->low_ino);
-        if (ret)
-                return ret;
+        if (proc_alloc_inum(&dp->low_ino))
+                goto out_free_entry;
 
         write_lock(&proc_subdir_lock);
         dp->parent = dir;
@@ -360,12 +360,16 @@ static int proc_register(struct proc_dir_entry * dir, struct proc_dir_entry * dp
                 WARN(1, "proc_dir_entry '%s/%s' already registered\n",
                      dir->name, dp->name);
                 write_unlock(&proc_subdir_lock);
-                proc_free_inum(dp->low_ino);
-                return -EEXIST;
+                goto out_free_inum;
         }
         write_unlock(&proc_subdir_lock);
 
-        return 0;
+        return dp;
+out_free_inum:
+        proc_free_inum(dp->low_ino);
+out_free_entry:
+        pde_free(dp);
+        return NULL;
 }
 
 static struct proc_dir_entry *__proc_create(struct proc_dir_entry **parent,
@@ -443,10 +447,7 @@ struct proc_dir_entry *proc_symlink(const char *name,
                 if (ent->data) {
                         strcpy((char*)ent->data,dest);
                         ent->proc_iops = &proc_link_inode_operations;
-                        if (proc_register(parent, ent) < 0) {
-                                pde_free(ent);
-                                ent = NULL;
-                        }
+                        ent = proc_register(parent, ent);
                 } else {
                         pde_free(ent);
                         ent = NULL;
@@ -470,11 +471,9 @@ struct proc_dir_entry *proc_mkdir_data(const char *name, umode_t mode,
                 ent->proc_fops = &proc_dir_operations;
                 ent->proc_iops = &proc_dir_inode_operations;
                 parent->nlink++;
-                if (proc_register(parent, ent) < 0) {
-                        pde_free(ent);
+                ent = proc_register(parent, ent);
+                if (!ent)
                         parent->nlink--;
-                        ent = NULL;
-                }
         }
         return ent;
 }
@@ -505,47 +504,47 @@ struct proc_dir_entry *proc_create_mount_point(const char *name)
                 ent->proc_fops = NULL;
                 ent->proc_iops = NULL;
                 parent->nlink++;
-                if (proc_register(parent, ent) < 0) {
-                        pde_free(ent);
+                ent = proc_register(parent, ent);
+                if (!ent)
                         parent->nlink--;
-                        ent = NULL;
-                }
         }
         return ent;
 }
 EXPORT_SYMBOL(proc_create_mount_point);
 
-struct proc_dir_entry *proc_create_data(const char *name, umode_t mode,
-                                        struct proc_dir_entry *parent,
-                                        const struct file_operations *proc_fops,
-                                        void *data)
+struct proc_dir_entry *proc_create_reg(const char *name, umode_t mode,
+                struct proc_dir_entry **parent, void *data)
 {
-        struct proc_dir_entry *pde;
+        struct proc_dir_entry *p;
+
         if ((mode & S_IFMT) == 0)
                 mode |= S_IFREG;
-
-        if (!S_ISREG(mode)) {
-                WARN_ON(1);     /* use proc_mkdir() */
+        if ((mode & S_IALLUGO) == 0)
+                mode |= S_IRUGO;
+        if (WARN_ON_ONCE(!S_ISREG(mode)))
                 return NULL;
+
+        p = __proc_create(parent, name, mode, 1);
+        if (p) {
+                p->proc_iops = &proc_file_inode_operations;
+                p->data = data;
         }
+        return p;
+}
+
+struct proc_dir_entry *proc_create_data(const char *name, umode_t mode,
+                struct proc_dir_entry *parent,
+                const struct file_operations *proc_fops, void *data)
+{
+        struct proc_dir_entry *p;
 
         BUG_ON(proc_fops == NULL);
 
-        if ((mode & S_IALLUGO) == 0)
-                mode |= S_IRUGO;
-        pde = __proc_create(&parent, name, mode, 1);
-        if (!pde)
-                goto out;
-        pde->proc_fops = proc_fops;
-        pde->data = data;
-        pde->proc_iops = &proc_file_inode_operations;
-        if (proc_register(parent, pde) < 0)
-                goto out_free;
-        return pde;
-out_free:
-        pde_free(pde);
-out:
-        return NULL;
+        p = proc_create_reg(name, mode, &parent, data);
+        if (!p)
+                return NULL;
+        p->proc_fops = proc_fops;
+        return proc_register(parent, p);
 }
 EXPORT_SYMBOL(proc_create_data);
  
@@ -557,6 +556,67 @@ struct proc_dir_entry *proc_create(const char *name, umode_t mode,
 }
 EXPORT_SYMBOL(proc_create);
 
+static int proc_seq_open(struct inode *inode, struct file *file)
+{
+        struct proc_dir_entry *de = PDE(inode);
+
+        if (de->state_size)
+                return seq_open_private(file, de->seq_ops, de->state_size);
+        return seq_open(file, de->seq_ops);
+}
+
+static const struct file_operations proc_seq_fops = {
+        .open           = proc_seq_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = seq_release,
+};
+
+struct proc_dir_entry *proc_create_seq_private(const char *name, umode_t mode,
+                struct proc_dir_entry *parent, const struct seq_operations *ops,
+                unsigned int state_size, void *data)
+{
+        struct proc_dir_entry *p;
+
+        p = proc_create_reg(name, mode, &parent, data);
+        if (!p)
+                return NULL;
+        p->proc_fops = &proc_seq_fops;
+        p->seq_ops = ops;
+        p->state_size = state_size;
+        return proc_register(parent, p);
+}
+EXPORT_SYMBOL(proc_create_seq_private);
+
+static int proc_single_open(struct inode *inode, struct file *file)
+{
+        struct proc_dir_entry *de = PDE(inode);
+
+        return single_open(file, de->single_show, de->data);
+}
+
+static const struct file_operations proc_single_fops = {
+        .open           = proc_single_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
+
+struct proc_dir_entry *proc_create_single_data(const char *name, umode_t mode,
+                struct proc_dir_entry *parent,
+                int (*show)(struct seq_file *, void *), void *data)
+{
+        struct proc_dir_entry *p;
+
+        p = proc_create_reg(name, mode, &parent, data);
+        if (!p)
+                return NULL;
+        p->proc_fops = &proc_single_fops;
+        p->single_show = show;
+        return proc_register(parent, p);
+}
+EXPORT_SYMBOL(proc_create_single_data);
+
 void proc_set_size(struct proc_dir_entry *de, loff_t size)
 {
         de->size = size;
diff --git a/fs/proc/internal.h b/fs/proc/internal.h
index 0f1692e63cb6..a318ae5b36b4 100644
--- a/fs/proc/internal.h
+++ b/fs/proc/internal.h
@@ -44,7 +44,12 @@ struct proc_dir_entry {
         struct completion *pde_unload_completion;
         const struct inode_operations *proc_iops;
         const struct file_operations *proc_fops;
+        union {
+                const struct seq_operations *seq_ops;
+                int (*single_show)(struct seq_file *, void *);
+        };
         void *data;
+        unsigned int state_size;
         unsigned int low_ino;
         nlink_t nlink;
         kuid_t uid;
@@ -57,9 +62,9 @@ struct proc_dir_entry {
         umode_t mode;
         u8 namelen;
 #ifdef CONFIG_64BIT
-#define SIZEOF_PDE_INLINE_NAME  (192-139)
+#define SIZEOF_PDE_INLINE_NAME  (192-155)
 #else
-#define SIZEOF_PDE_INLINE_NAME  (128-87)
+#define SIZEOF_PDE_INLINE_NAME  (128-95)
 #endif
         char inline_name[SIZEOF_PDE_INLINE_NAME];
 } __randomize_layout;
@@ -162,6 +167,10 @@ extern bool proc_fill_cache(struct file *, struct dir_context *, const char *, i
 /*
  * generic.c
  */
+struct proc_dir_entry *proc_create_reg(const char *name, umode_t mode,
+                struct proc_dir_entry **parent, void *data);
+struct proc_dir_entry *proc_register(struct proc_dir_entry *dir,
+                struct proc_dir_entry *dp);
 extern struct dentry *proc_lookup(struct inode *, struct dentry *, unsigned int);
 struct dentry *proc_lookup_de(struct inode *, struct dentry *, struct proc_dir_entry *);
 extern int proc_readdir(struct file *, struct dir_context *);
diff --git a/fs/proc/interrupts.c b/fs/proc/interrupts.c
index 6a6bee9c603c..cb0edc7cbf09 100644
--- a/fs/proc/interrupts.c
+++ b/fs/proc/interrupts.c
@@ -34,21 +34,9 @@ static const struct seq_operations int_seq_ops = {
         .show  = show_interrupts
 };
 
-static int interrupts_open(struct inode *inode, struct file *filp)
-{
-        return seq_open(filp, &int_seq_ops);
-}
-
-static const struct file_operations proc_interrupts_operations = {
-        .open           = interrupts_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release,
-};
-
 static int __init proc_interrupts_init(void)
 {
-        proc_create("interrupts", 0, NULL, &proc_interrupts_operations);
+        proc_create_seq("interrupts", 0, NULL, &int_seq_ops);
         return 0;
 }
 fs_initcall(proc_interrupts_init);
diff --git a/fs/proc/loadavg.c b/fs/proc/loadavg.c
index b572cc865b92..d06694757201 100644
--- a/fs/proc/loadavg.c
+++ b/fs/proc/loadavg.c
@@ -28,21 +28,9 @@ static int loadavg_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int loadavg_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, loadavg_proc_show, NULL);
-}
-
-static const struct file_operations loadavg_proc_fops = {
-        .open           = loadavg_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static int __init proc_loadavg_init(void)
 {
-        proc_create("loadavg", 0, NULL, &loadavg_proc_fops);
+        proc_create_single("loadavg", 0, NULL, loadavg_proc_show);
         return 0;
 }
 fs_initcall(proc_loadavg_init);
diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
index 65a72ab57471..2fb04846ed11 100644
--- a/fs/proc/meminfo.c
+++ b/fs/proc/meminfo.c
@@ -149,21 +149,9 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int meminfo_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, meminfo_proc_show, NULL);
-}
-
-static const struct file_operations meminfo_proc_fops = {
-        .open           = meminfo_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static int __init proc_meminfo_init(void)
 {
-        proc_create("meminfo", 0, NULL, &meminfo_proc_fops);
+        proc_create_single("meminfo", 0, NULL, meminfo_proc_show);
         return 0;
 }
 fs_initcall(proc_meminfo_init);
diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
index 75634379f82e..3b63be64e436 100644
--- a/fs/proc/nommu.c
+++ b/fs/proc/nommu.c
@@ -113,21 +113,9 @@ static const struct seq_operations proc_nommu_region_list_seqop = {
         .show   = nommu_region_list_show
 };
 
-static int proc_nommu_region_list_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &proc_nommu_region_list_seqop);
-}
-
-static const struct file_operations proc_nommu_region_list_operations = {
-        .open    = proc_nommu_region_list_open,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
-        .release = seq_release,
-};
-
 static int __init proc_nommu_init(void)
 {
-        proc_create("maps", S_IRUGO, NULL, &proc_nommu_region_list_operations);
+        proc_create_seq("maps", S_IRUGO, NULL, &proc_nommu_region_list_seqop);
         return 0;
 }
 
diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c
index 1763f370489d..7d94fa005b0d 100644
--- a/fs/proc/proc_net.c
+++ b/fs/proc/proc_net.c
@@ -38,20 +38,20 @@ static struct net *get_proc_net(const struct inode *inode)
         return maybe_get_net(PDE_NET(PDE(inode)));
 }
 
-int seq_open_net(struct inode *ino, struct file *f,
-                 const struct seq_operations *ops, int size)
+static int seq_open_net(struct inode *inode, struct file *file)
 {
-        struct net *net;
+        unsigned int state_size = PDE(inode)->state_size;
         struct seq_net_private *p;
+        struct net *net;
 
-        BUG_ON(size < sizeof(*p));
+        WARN_ON_ONCE(state_size < sizeof(*p));
 
-        net = get_proc_net(ino);
-        if (net == NULL)
+        net = get_proc_net(inode);
+        if (!net)
                 return -ENXIO;
 
-        p = __seq_open_private(f, ops, size);
-        if (p == NULL) {
+        p = __seq_open_private(file, PDE(inode)->seq_ops, state_size);
+        if (!p) {
                 put_net(net);
                 return -ENOMEM;
         }
@@ -60,51 +60,83 @@ int seq_open_net(struct inode *ino, struct file *f,
 #endif
         return 0;
 }
-EXPORT_SYMBOL_GPL(seq_open_net);
 
-int single_open_net(struct inode *inode, struct file *file,
-                int (*show)(struct seq_file *, void *))
+static int seq_release_net(struct inode *ino, struct file *f)
 {
-        int err;
-        struct net *net;
-
-        err = -ENXIO;
-        net = get_proc_net(inode);
-        if (net == NULL)
-                goto err_net;
-
-        err = single_open(file, show, net);
-        if (err < 0)
-                goto err_open;
+        struct seq_file *seq = f->private_data;
 
+        put_net(seq_file_net(seq));
+        seq_release_private(ino, f);
         return 0;
+}
 
-err_open:
-        put_net(net);
-err_net:
-        return err;
+static const struct file_operations proc_net_seq_fops = {
+        .open           = seq_open_net,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = seq_release_net,
+};
+
+struct proc_dir_entry *proc_create_net_data(const char *name, umode_t mode,
+                struct proc_dir_entry *parent, const struct seq_operations *ops,
+                unsigned int state_size, void *data)
+{
+        struct proc_dir_entry *p;
+
+        p = proc_create_reg(name, mode, &parent, data);
+        if (!p)
+                return NULL;
+        p->proc_fops = &proc_net_seq_fops;
+        p->seq_ops = ops;
+        p->state_size = state_size;
+        return proc_register(parent, p);
 }
-EXPORT_SYMBOL_GPL(single_open_net);
+EXPORT_SYMBOL_GPL(proc_create_net_data);
 
-int seq_release_net(struct inode *ino, struct file *f)
+static int single_open_net(struct inode *inode, struct file *file)
 {
-        struct seq_file *seq;
+        struct proc_dir_entry *de = PDE(inode);
+        struct net *net;
+        int err;
 
-        seq = f->private_data;
+        net = get_proc_net(inode);
+        if (!net)
+                return -ENXIO;
 
-        put_net(seq_file_net(seq));
-        seq_release_private(ino, f);
-        return 0;
+        err = single_open(file, de->single_show, net);
+        if (err)
+                put_net(net);
+        return err;
 }
-EXPORT_SYMBOL_GPL(seq_release_net);
 
-int single_release_net(struct inode *ino, struct file *f)
+static int single_release_net(struct inode *ino, struct file *f)
 {
         struct seq_file *seq = f->private_data;
         put_net(seq->private);
         return single_release(ino, f);
 }
-EXPORT_SYMBOL_GPL(single_release_net);
+
+static const struct file_operations proc_net_single_fops = {
+        .open           = single_open_net,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release_net,
+};
+
+struct proc_dir_entry *proc_create_net_single(const char *name, umode_t mode,
+                struct proc_dir_entry *parent,
+                int (*show)(struct seq_file *, void *), void *data)
+{
+        struct proc_dir_entry *p;
+
+        p = proc_create_reg(name, mode, &parent, data);
+        if (!p)
+                return NULL;
+        p->proc_fops = &proc_net_single_fops;
+        p->single_show = show;
+        return proc_register(parent, p);
+}
+EXPORT_SYMBOL_GPL(proc_create_net_single);
 
 static struct net *get_proc_task_net(struct inode *dir)
 {
diff --git a/fs/proc/proc_tty.c b/fs/proc/proc_tty.c
index d0cf1c50bb6c..c69ff191e5d8 100644
--- a/fs/proc/proc_tty.c
+++ b/fs/proc/proc_tty.c
@@ -126,18 +126,6 @@ static const struct seq_operations tty_drivers_op = {
         .show   = show_tty_driver
 };
 
-static int tty_drivers_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &tty_drivers_op);
-}
-
-static const struct file_operations proc_tty_drivers_operations = {
-        .open           = tty_drivers_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release,
-};
-
 /*
  * This function is called by tty_register_driver() to handle
  * registering the driver's /proc handler into /proc/tty/driver/<foo>
@@ -147,11 +135,11 @@ void proc_tty_register_driver(struct tty_driver *driver)
         struct proc_dir_entry *ent;
                 
         if (!driver->driver_name || driver->proc_entry ||
-            !driver->ops->proc_fops)
+            !driver->ops->proc_show)
                 return;
 
-        ent = proc_create_data(driver->driver_name, 0, proc_tty_driver,
-                               driver->ops->proc_fops, driver);
+        ent = proc_create_single_data(driver->driver_name, 0, proc_tty_driver,
+                               driver->ops->proc_show, driver);
         driver->proc_entry = ent;
 }
 
@@ -186,6 +174,6 @@ void __init proc_tty_init(void)
          * entry.
          */
         proc_tty_driver = proc_mkdir_mode("tty/driver", S_IRUSR|S_IXUSR, NULL);
-        proc_create("tty/ldiscs", 0, NULL, &tty_ldiscs_proc_fops);
-        proc_create("tty/drivers", 0, NULL, &proc_tty_drivers_operations);
+        proc_create_seq("tty/ldiscs", 0, NULL, &tty_ldiscs_seq_ops);
+        proc_create_seq("tty/drivers", 0, NULL, &tty_drivers_op);
 }
diff --git a/fs/proc/self.c b/fs/proc/self.c
index 4d7d061696b3..127265e5c55f 100644
--- a/fs/proc/self.c
+++ b/fs/proc/self.c
@@ -12,7 +12,7 @@ static const char *proc_self_get_link(struct dentry *dentry,
                                       struct inode *inode,
                                       struct delayed_call *done)
 {
-        struct pid_namespace *ns = inode->i_sb->s_fs_info;
+        struct pid_namespace *ns = proc_pid_ns(inode);
         pid_t tgid = task_tgid_nr_ns(current, ns);
         char *name;
 
@@ -36,7 +36,7 @@ static unsigned self_inum __ro_after_init;
 int proc_setup_self(struct super_block *s)
 {
         struct inode *root_inode = d_inode(s->s_root);
-        struct pid_namespace *ns = s->s_fs_info;
+        struct pid_namespace *ns = proc_pid_ns(root_inode);
         struct dentry *self;
         
         inode_lock(root_inode);
diff --git a/fs/proc/softirqs.c b/fs/proc/softirqs.c
index 24072cc06e65..12901dcf57e2 100644
--- a/fs/proc/softirqs.c
+++ b/fs/proc/softirqs.c
@@ -25,21 +25,9 @@ static int show_softirqs(struct seq_file *p, void *v)
         return 0;
 }
 
-static int softirqs_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, show_softirqs, NULL);
-}
-
-static const struct file_operations proc_softirqs_operations = {
-        .open           = softirqs_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static int __init proc_softirqs_init(void)
 {
-        proc_create("softirqs", 0, NULL, &proc_softirqs_operations);
+        proc_create_single("softirqs", 0, NULL, show_softirqs);
         return 0;
 }
 fs_initcall(proc_softirqs_init);
diff --git a/fs/proc/thread_self.c b/fs/proc/thread_self.c
index 9d2efaca499f..b905010ca9eb 100644
--- a/fs/proc/thread_self.c
+++ b/fs/proc/thread_self.c
@@ -12,7 +12,7 @@ static const char *proc_thread_self_get_link(struct dentry *dentry,
                                              struct inode *inode,
                                              struct delayed_call *done)
 {
-        struct pid_namespace *ns = inode->i_sb->s_fs_info;
+        struct pid_namespace *ns = proc_pid_ns(inode);
         pid_t tgid = task_tgid_nr_ns(current, ns);
         pid_t pid = task_pid_nr_ns(current, ns);
         char *name;
@@ -36,7 +36,7 @@ static unsigned thread_self_inum __ro_after_init;
 int proc_setup_thread_self(struct super_block *s)
 {
         struct inode *root_inode = d_inode(s->s_root);
-        struct pid_namespace *ns = s->s_fs_info;
+        struct pid_namespace *ns = proc_pid_ns(root_inode);
         struct dentry *thread_self;
 
         inode_lock(root_inode);
diff --git a/fs/proc/uptime.c b/fs/proc/uptime.c
index 95a708d83721..3bd12f955867 100644
--- a/fs/proc/uptime.c
+++ b/fs/proc/uptime.c
@@ -30,21 +30,9 @@ static int uptime_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int uptime_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, uptime_proc_show, NULL);
-}
-
-static const struct file_operations uptime_proc_fops = {
-        .open           = uptime_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static int __init proc_uptime_init(void)
 {
-        proc_create("uptime", 0, NULL, &uptime_proc_fops);
+        proc_create_single("uptime", 0, NULL, uptime_proc_show);
         return 0;
 }
 fs_initcall(proc_uptime_init);
diff --git a/fs/proc/version.c b/fs/proc/version.c
index 94901e8e700d..b449f186577f 100644
--- a/fs/proc/version.c
+++ b/fs/proc/version.c
@@ -15,21 +15,9 @@ static int version_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int version_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, version_proc_show, NULL);
-}
-
-static const struct file_operations version_proc_fops = {
-        .open           = version_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static int __init proc_version_init(void)
 {
-        proc_create("version", 0, NULL, &version_proc_fops);
+        proc_create_single("version", 0, NULL, version_proc_show);
         return 0;
 }
 fs_initcall(proc_version_init);
diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c
index fe999157dd97..e39b3910d24d 100644
--- a/fs/reiserfs/procfs.c
+++ b/fs/reiserfs/procfs.c
@@ -389,27 +389,13 @@ static int show_journal(struct seq_file *m, void *unused)
         return 0;
 }
 
-static int r_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, PDE_DATA(inode), 
-                                proc_get_parent_data(inode));
-}
-
-static const struct file_operations r_file_operations = {
-        .open = r_open,
-        .read = seq_read,
-        .llseek = seq_lseek,
-        .release = single_release,
-};
-
 static struct proc_dir_entry *proc_info_root = NULL;
 static const char proc_info_root_name[] = "fs/reiserfs";
 
 static void add_file(struct super_block *sb, char *name,
                      int (*func) (struct seq_file *, void *))
 {
-        proc_create_data(name, 0, REISERFS_SB(sb)->procdir,
-                         &r_file_operations, func);
+        proc_create_single_data(name, 0, REISERFS_SB(sb)->procdir, func, sb);
 }
 
 int reiserfs_proc_info_init(struct super_block *sb)
diff --git a/fs/xfs/xfs_stats.c b/fs/xfs/xfs_stats.c
index 056e12b421eb..1cc79907b377 100644
--- a/fs/xfs/xfs_stats.c
+++ b/fs/xfs/xfs_stats.c
@@ -113,6 +113,7 @@ void xfs_stats_clearall(struct xfsstats __percpu *stats)
         }
 }
 
+#ifdef CONFIG_PROC_FS
 /* legacy quota interfaces */
 #ifdef CONFIG_XFS_QUOTA
 static int xqm_proc_show(struct seq_file *m, void *v)
@@ -124,18 +125,6 @@ static int xqm_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int xqm_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, xqm_proc_show, NULL);
-}
-
-static const struct file_operations xqm_proc_fops = {
-        .open           = xqm_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 /* legacy quota stats interface no 2 */
 static int xqmstat_proc_show(struct seq_file *m, void *v)
 {
@@ -147,22 +136,8 @@ static int xqmstat_proc_show(struct seq_file *m, void *v)
         seq_putc(m, '\n');
         return 0;
 }
-
-static int xqmstat_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, xqmstat_proc_show, NULL);
-}
-
-static const struct file_operations xqmstat_proc_fops = {
-        .owner          = THIS_MODULE,
-        .open           = xqmstat_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
 #endif /* CONFIG_XFS_QUOTA */
 
-#ifdef CONFIG_PROC_FS
 int
 xfs_init_procfs(void)
 {
@@ -174,11 +149,9 @@ xfs_init_procfs(void)
                 goto out;
 
 #ifdef CONFIG_XFS_QUOTA
-        if (!proc_create("fs/xfs/xqmstat", 0, NULL,
-                         &xqmstat_proc_fops))
+        if (!proc_create_single("fs/xfs/xqmstat", 0, NULL, xqmstat_proc_show))
                 goto out;
-        if (!proc_create("fs/xfs/xqm", 0, NULL,
-                         &xqm_proc_fops))
+        if (!proc_create_single("fs/xfs/xqm", 0, NULL, xqm_proc_show))
                 goto out;
 #endif
         return 0;
diff --git a/include/linux/atalk.h b/include/linux/atalk.h
index 40373920ea58..23f805562f4e 100644
--- a/include/linux/atalk.h
+++ b/include/linux/atalk.h
@@ -145,7 +145,12 @@ extern rwlock_t atalk_interfaces_lock;
 
 extern struct atalk_route atrtr_default;
 
-extern const struct file_operations atalk_seq_arp_fops;
+struct aarp_iter_state {
+        int bucket;
+        struct aarp_entry **table;
+};
+
+extern const struct seq_operations aarp_seq_ops;
 
 extern int sysctl_aarp_expiry_time;
 extern int sysctl_aarp_tick_time;
diff --git a/include/linux/ide.h b/include/linux/ide.h
index ca9d34feb572..752464f5a772 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -961,7 +961,7 @@ __IDE_PROC_DEVSET(_name, _min, _max, NULL, NULL)
 typedef struct {
         const char      *name;
         umode_t         mode;
-        const struct file_operations *proc_fops;
+        int (*show)(struct seq_file *, void *);
 } ide_proc_entry_t;
 
 void proc_ide_create(void);
@@ -973,8 +973,8 @@ void ide_proc_unregister_port(ide_hwif_t *);
 void ide_proc_register_driver(ide_drive_t *, struct ide_driver *);
 void ide_proc_unregister_driver(ide_drive_t *, struct ide_driver *);
 
-extern const struct file_operations ide_capacity_proc_fops;
-extern const struct file_operations ide_geometry_proc_fops;
+int ide_capacity_proc_show(struct seq_file *m, void *v);
+int ide_geometry_proc_show(struct seq_file *m, void *v);
 #else
 static inline void proc_ide_create(void) { ; }
 static inline void proc_ide_destroy(void) { ; }
diff --git a/include/linux/isdn/capilli.h b/include/linux/isdn/capilli.h
index 11b57c485854..d75e1ad72964 100644
--- a/include/linux/isdn/capilli.h
+++ b/include/linux/isdn/capilli.h
@@ -50,7 +50,7 @@ struct capi_ctr {
         u16  (*send_message)(struct capi_ctr *, struct sk_buff *skb);
         
         char *(*procinfo)(struct capi_ctr *);
-        const struct file_operations *proc_fops;
+        int (*proc_show)(struct seq_file *, void *);
 
         /* filled in before calling ready callback */
         u8 manu[CAPI_MANUFACTURER_LEN];         /* CAPI_GET_MANUFACTURER */
diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
index 928ef9e4d912..e518352137e7 100644
--- a/include/linux/proc_fs.h
+++ b/include/linux/proc_fs.h
@@ -9,6 +9,8 @@
 #include <linux/fs.h>
 
 struct proc_dir_entry;
+struct seq_file;
+struct seq_operations;
 
 #ifdef CONFIG_PROC_FS
 
@@ -23,6 +25,19 @@ extern struct proc_dir_entry *proc_mkdir_data(const char *, umode_t,
 extern struct proc_dir_entry *proc_mkdir_mode(const char *, umode_t,
                                               struct proc_dir_entry *);
 struct proc_dir_entry *proc_create_mount_point(const char *name);
+
+struct proc_dir_entry *proc_create_seq_private(const char *name, umode_t mode,
+                struct proc_dir_entry *parent, const struct seq_operations *ops,
+                unsigned int state_size, void *data);
+#define proc_create_seq_data(name, mode, parent, ops, data) \
+        proc_create_seq_private(name, mode, parent, ops, 0, data)
+#define proc_create_seq(name, mode, parent, ops) \
+        proc_create_seq_private(name, mode, parent, ops, 0, NULL)
+struct proc_dir_entry *proc_create_single_data(const char *name, umode_t mode,
+                struct proc_dir_entry *parent,
+                int (*show)(struct seq_file *, void *), void *data);
+#define proc_create_single(name, mode, parent, show) \
+        proc_create_single_data(name, mode, parent, show, NULL)
  
 extern struct proc_dir_entry *proc_create_data(const char *, umode_t,
                                                struct proc_dir_entry *,
@@ -38,6 +53,15 @@ extern void proc_remove(struct proc_dir_entry *);
 extern void remove_proc_entry(const char *, struct proc_dir_entry *);
 extern int remove_proc_subtree(const char *, struct proc_dir_entry *);
 
+struct proc_dir_entry *proc_create_net_data(const char *name, umode_t mode,
+                struct proc_dir_entry *parent, const struct seq_operations *ops,
+                unsigned int state_size, void *data);
+#define proc_create_net(name, mode, parent, state_size, ops) \
+        proc_create_net_data(name, mode, parent, state_size, ops, NULL)
+struct proc_dir_entry *proc_create_net_single(const char *name, umode_t mode,
+                struct proc_dir_entry *parent,
+                int (*show)(struct seq_file *, void *), void *data);
+
 #else /* CONFIG_PROC_FS */
 
 static inline void proc_root_init(void)
@@ -57,6 +81,11 @@ static inline struct proc_dir_entry *proc_mkdir_data(const char *name,
         umode_t mode, struct proc_dir_entry *parent, void *data) { return NULL; }
 static inline struct proc_dir_entry *proc_mkdir_mode(const char *name,
         umode_t mode, struct proc_dir_entry *parent) { return NULL; }
+#define proc_create_seq_private(name, mode, parent, ops, size, data) ({NULL;})
+#define proc_create_seq_data(name, mode, parent, ops, data) ({NULL;})
+#define proc_create_seq(name, mode, parent, ops) ({NULL;})
+#define proc_create_single(name, mode, parent, show) ({NULL;})
+#define proc_create_single_data(name, mode, parent, show, data) ({NULL;})
 #define proc_create(name, mode, parent, proc_fops) ({NULL;})
 #define proc_create_data(name, mode, parent, proc_fops, data) ({NULL;})
 
@@ -69,6 +98,10 @@ static inline void proc_remove(struct proc_dir_entry *de) {}
 #define remove_proc_entry(name, parent) do {} while (0)
 static inline int remove_proc_subtree(const char *name, struct proc_dir_entry *parent) { return 0; }
 
+#define proc_create_net_data(name, mode, parent, ops, state_size, data) ({NULL;})
+#define proc_create_net(name, mode, parent, state_size, ops) ({NULL;})
+#define proc_create_net_single(name, mode, parent, show, data) ({NULL;})
+
 #endif /* CONFIG_PROC_FS */
 
 struct net;
@@ -83,4 +116,10 @@ struct ns_common;
 int open_related_ns(struct ns_common *ns,
                    struct ns_common *(*get_ns)(struct ns_common *ns));
 
+/* get the associated pid namespace for a file in procfs */
+static inline struct pid_namespace *proc_pid_ns(struct inode *inode)
+{
+        return inode->i_sb->s_fs_info;
+}
+
 #endif /* _LINUX_PROC_FS_H */
diff --git a/include/linux/seq_file_net.h b/include/linux/seq_file_net.h
index 43ccd84127b6..0fdbe1ddd8d1 100644
--- a/include/linux/seq_file_net.h
+++ b/include/linux/seq_file_net.h
@@ -13,12 +13,6 @@ struct seq_net_private {
 #endif
 };
 
-int seq_open_net(struct inode *, struct file *,
-                 const struct seq_operations *, int);
-int single_open_net(struct inode *, struct file *file,
-                int (*show)(struct seq_file *, void *));
-int seq_release_net(struct inode *, struct file *);
-int single_release_net(struct inode *, struct file *);
 static inline struct net *seq_file_net(struct seq_file *seq)
 {
 #ifdef CONFIG_NET_NS
@@ -28,4 +22,17 @@ static inline struct net *seq_file_net(struct seq_file *seq)
 #endif
 }
 
+/*
+ * This one is needed for proc_create_net_single since net is stored directly
+ * in private not as a struct i.e. seq_file_net can't be used.
+ */
+static inline struct net *seq_file_single_net(struct seq_file *seq)
+{
+#ifdef CONFIG_NET_NS
+        return (struct net *)seq->private;
+#else
+        return &init_net;
+#endif
+}
+
 #endif
diff --git a/include/linux/tty.h b/include/linux/tty.h
index 1dd587ba6d88..9bd7d37adbfa 100644
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -10,6 +10,7 @@
 #include <linux/tty_ldisc.h>
 #include <linux/mutex.h>
 #include <linux/tty_flags.h>
+#include <linux/seq_file.h>
 #include <uapi/linux/tty.h>
 #include <linux/rwsem.h>
 #include <linux/llist.h>
@@ -535,7 +536,7 @@ extern void tty_ldisc_deref(struct tty_ldisc *);
 extern struct tty_ldisc *tty_ldisc_ref_wait(struct tty_struct *);
 extern void tty_ldisc_hangup(struct tty_struct *tty, bool reset);
 extern int tty_ldisc_reinit(struct tty_struct *tty, int disc);
-extern const struct file_operations tty_ldiscs_proc_fops;
+extern const struct seq_operations tty_ldiscs_seq_ops;
 
 extern void tty_wakeup(struct tty_struct *tty);
 extern void tty_ldisc_flush(struct tty_struct *tty);
diff --git a/include/linux/tty_driver.h b/include/linux/tty_driver.h
index 31c2b5b166de..71dbc891851a 100644
--- a/include/linux/tty_driver.h
+++ b/include/linux/tty_driver.h
@@ -293,7 +293,7 @@ struct tty_operations {
         int (*poll_get_char)(struct tty_driver *driver, int line);
         void (*poll_put_char)(struct tty_driver *driver, int line, char ch);
 #endif
-        const struct file_operations *proc_fops;
+        int (*proc_show)(struct seq_file *, void *);
 } __randomize_layout;
 
 struct tty_driver {
diff --git a/include/net/ax25.h b/include/net/ax25.h
index c91bc87931c7..3f9aea8087e3 100644
--- a/include/net/ax25.h
+++ b/include/net/ax25.h
@@ -15,6 +15,7 @@
 #include <linux/refcount.h>
 #include <net/neighbour.h>
 #include <net/sock.h>
+#include <linux/seq_file.h>
 
 #define AX25_T1CLAMPLO                  1
 #define AX25_T1CLAMPHI                  (30 * HZ)
@@ -399,7 +400,7 @@ int ax25_check_iframes_acked(ax25_cb *, unsigned short);
 /* ax25_route.c */
 void ax25_rt_device_down(struct net_device *);
 int ax25_rt_ioctl(unsigned int, void __user *);
-extern const struct file_operations ax25_route_fops;
+extern const struct seq_operations ax25_rt_seqops;
 ax25_route *ax25_get_route(ax25_address *addr, struct net_device *dev);
 int ax25_rt_autobind(ax25_cb *, ax25_address *);
 struct sk_buff *ax25_rt_build_path(struct sk_buff *, ax25_address *,
@@ -455,7 +456,7 @@ unsigned long ax25_display_timer(struct timer_list *);
 extern int  ax25_uid_policy;
 ax25_uid_assoc *ax25_findbyuid(kuid_t);
 int __must_check ax25_uid_ioctl(int, struct sockaddr_ax25 *);
-extern const struct file_operations ax25_uid_fops;
+extern const struct seq_operations ax25_uid_seqops;
 void ax25_uid_free(void);
 
 /* sysctl_net_ax25.c */
diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h
index 5e86fd9dc857..0e79c3408569 100644
--- a/include/net/ip6_fib.h
+++ b/include/net/ip6_fib.h
@@ -394,7 +394,15 @@ void fib6_gc_cleanup(void);
 
 int fib6_init(void);
 
-int ipv6_route_open(struct inode *inode, struct file *file);
+struct ipv6_route_iter {
+        struct seq_net_private p;
+        struct fib6_walker w;
+        loff_t skip;
+        struct fib6_table *tbl;
+        int sernum;
+};
+
+extern const struct seq_operations ipv6_route_seq_ops;
 
 int call_fib6_notifier(struct notifier_block *nb, struct net *net,
                        enum fib_event_type event_type,
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
index eb0bec043c96..aea7a124e66b 100644
--- a/include/net/ip_vs.h
+++ b/include/net/ip_vs.h
@@ -41,18 +41,6 @@ static inline struct netns_ipvs *net_ipvs(struct net* net)
         return net->ipvs;
 }
 
-/* This one needed for single_open_net since net is stored directly in
- * private not as a struct i.e. seq_file_net can't be used.
- */
-static inline struct net *seq_file_single_net(struct seq_file *seq)
-{
-#ifdef CONFIG_NET_NS
-        return (struct net *)seq->private;
-#else
-        return &init_net;
-#endif
-}
-
 /* Connections' size value needed by ip_vs_ctl.c */
 extern int ip_vs_conn_tab_size;
 
diff --git a/include/net/netrom.h b/include/net/netrom.h
index 0dad2dd5f9d7..5a0714ff500f 100644
--- a/include/net/netrom.h
+++ b/include/net/netrom.h
@@ -13,6 +13,7 @@
 #include <linux/slab.h>
 #include <net/sock.h>
 #include <linux/refcount.h>
+#include <linux/seq_file.h>
 
 #define NR_NETWORK_LEN                  15
 #define NR_TRANSPORT_LEN                5
@@ -216,8 +217,8 @@ struct net_device *nr_dev_get(ax25_address *);
 int nr_rt_ioctl(unsigned int, void __user *);
 void nr_link_failed(ax25_cb *, int);
 int nr_route_frame(struct sk_buff *, ax25_cb *);
-extern const struct file_operations nr_nodes_fops;
-extern const struct file_operations nr_neigh_fops;
+extern const struct seq_operations nr_node_seqops;
+extern const struct seq_operations nr_neigh_seqops;
 void nr_rt_free(void);
 
 /* nr_subr.c */
diff --git a/include/net/phonet/pn_dev.h b/include/net/phonet/pn_dev.h
index 8639de5750f6..cbee32be1d9c 100644
--- a/include/net/phonet/pn_dev.h
+++ b/include/net/phonet/pn_dev.h
@@ -56,7 +56,7 @@ struct net_device *phonet_route_output(struct net *net, u8 daddr);
 
 #define PN_NO_ADDR      0xff
 
-extern const struct file_operations pn_sock_seq_fops;
-extern const struct file_operations pn_res_seq_fops;
+extern const struct seq_operations pn_sock_seq_ops;
+extern const struct seq_operations pn_res_seq_ops;
 
 #endif
diff --git a/include/net/ping.h b/include/net/ping.h
index 4cd90d6b5c25..fd080e043a6e 100644
--- a/include/net/ping.h
+++ b/include/net/ping.h
@@ -83,20 +83,9 @@ int  ping_queue_rcv_skb(struct sock *sk, struct sk_buff *skb);
 bool ping_rcv(struct sk_buff *skb);
 
 #ifdef CONFIG_PROC_FS
-struct ping_seq_afinfo {
-        char                            *name;
-        sa_family_t                     family;
-        const struct file_operations    *seq_fops;
-        const struct seq_operations     seq_ops;
-};
-
-extern const struct file_operations ping_seq_fops;
-
 void *ping_seq_start(struct seq_file *seq, loff_t *pos, sa_family_t family);
 void *ping_seq_next(struct seq_file *seq, void *v, loff_t *pos);
 void ping_seq_stop(struct seq_file *seq, void *v);
-int ping_proc_register(struct net *net, struct ping_seq_afinfo *afinfo);
-void ping_proc_unregister(struct net *net, struct ping_seq_afinfo *afinfo);
 
 int __init ping_proc_init(void);
 void ping_proc_exit(void);
diff --git a/include/net/raw.h b/include/net/raw.h
index 99d26d0c4a19..9c9fa98a91a4 100644
--- a/include/net/raw.h
+++ b/include/net/raw.h
@@ -48,7 +48,6 @@ void raw_proc_exit(void);
 struct raw_iter_state {
         struct seq_net_private p;
         int bucket;
-        struct raw_hashinfo *h;
 };
 
 static inline struct raw_iter_state *raw_seq_private(struct seq_file *seq)
@@ -58,9 +57,6 @@ static inline struct raw_iter_state *raw_seq_private(struct seq_file *seq)
 void *raw_seq_start(struct seq_file *seq, loff_t *pos);
 void *raw_seq_next(struct seq_file *seq, void *v, loff_t *pos);
 void raw_seq_stop(struct seq_file *seq, void *v);
-int raw_seq_open(struct inode *ino, struct file *file,
-                 struct raw_hashinfo *h, const struct seq_operations *ops);
-
 #endif
 
 int raw_hash_sk(struct sock *sk);
diff --git a/include/net/rose.h b/include/net/rose.h
index 04b72681f2ab..cf517d306a28 100644
--- a/include/net/rose.h
+++ b/include/net/rose.h
@@ -200,9 +200,9 @@ void rose_enquiry_response(struct sock *);
 
 /* rose_route.c */
 extern struct rose_neigh *rose_loopback_neigh;
-extern const struct file_operations rose_neigh_fops;
-extern const struct file_operations rose_nodes_fops;
-extern const struct file_operations rose_routes_fops;
+extern const struct seq_operations rose_neigh_seqops;
+extern const struct seq_operations rose_node_seqops;
+extern struct seq_operations rose_route_seqops;
 
 void rose_add_loopback_neigh(void);
 int __must_check rose_add_loopback_node(rose_address *);
diff --git a/include/net/tcp.h b/include/net/tcp.h
index 9c9b3768b350..51dc7a26a2fa 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -1747,27 +1747,22 @@ enum tcp_seq_states {
         TCP_SEQ_STATE_ESTABLISHED,
 };
 
-int tcp_seq_open(struct inode *inode, struct file *file);
+void *tcp_seq_start(struct seq_file *seq, loff_t *pos);
+void *tcp_seq_next(struct seq_file *seq, void *v, loff_t *pos);
+void tcp_seq_stop(struct seq_file *seq, void *v);
 
 struct tcp_seq_afinfo {
-        char                            *name;
         sa_family_t                     family;
-        const struct file_operations    *seq_fops;
-        struct seq_operations           seq_ops;
 };
 
 struct tcp_iter_state {
         struct seq_net_private  p;
-        sa_family_t             family;
         enum tcp_seq_states     state;
         struct sock             *syn_wait_sk;
         int                     bucket, offset, sbucket, num;
         loff_t                  last_pos;
 };
 
-int tcp_proc_register(struct net *net, struct tcp_seq_afinfo *afinfo);
-void tcp_proc_unregister(struct net *net, struct tcp_seq_afinfo *afinfo);
-
 extern struct request_sock_ops tcp_request_sock_ops;
 extern struct request_sock_ops tcp6_request_sock_ops;
 
diff --git a/include/net/udp.h b/include/net/udp.h
index 0676b272f6ac..621778b80e3d 100644
--- a/include/net/udp.h
+++ b/include/net/udp.h
@@ -408,31 +408,27 @@ do {									\
 #define __UDPX_INC_STATS(sk, field) __UDP_INC_STATS(sock_net(sk), field, 0)
 #endif
 
-/* /proc */
-int udp_seq_open(struct inode *inode, struct file *file);
-
+#ifdef CONFIG_PROC_FS
 struct udp_seq_afinfo {
-        char                            *name;
         sa_family_t                     family;
         struct udp_table                *udp_table;
-        const struct file_operations    *seq_fops;
-        struct seq_operations           seq_ops;
 };
 
 struct udp_iter_state {
         struct seq_net_private  p;
-        sa_family_t             family;
         int                     bucket;
-        struct udp_table        *udp_table;
 };
 
-#ifdef CONFIG_PROC_FS
-int udp_proc_register(struct net *net, struct udp_seq_afinfo *afinfo);
-void udp_proc_unregister(struct net *net, struct udp_seq_afinfo *afinfo);
+void *udp_seq_start(struct seq_file *seq, loff_t *pos);
+void *udp_seq_next(struct seq_file *seq, void *v, loff_t *pos);
+void udp_seq_stop(struct seq_file *seq, void *v);
+
+extern const struct seq_operations udp_seq_ops;
+extern const struct seq_operations udp6_seq_ops;
 
 int udp4_proc_init(void);
 void udp4_proc_exit(void);
-#endif
+#endif /* CONFIG_PROC_FS */
 
 int udpv4_offload_init(void);
 
diff --git a/kernel/cgroup/cgroup-internal.h b/kernel/cgroup/cgroup-internal.h
index b928b27050c6..0808a33d16d3 100644
--- a/kernel/cgroup/cgroup-internal.h
+++ b/kernel/cgroup/cgroup-internal.h
@@ -218,9 +218,9 @@ extern const struct proc_ns_operations cgroupns_operations;
  * cgroup-v1.c
  */
 extern struct cftype cgroup1_base_files[];
-extern const struct file_operations proc_cgroupstats_operations;
 extern struct kernfs_syscall_ops cgroup1_kf_syscall_ops;
 
+int proc_cgroupstats_show(struct seq_file *m, void *v);
 bool cgroup1_ssid_disabled(int ssid);
 void cgroup1_pidlist_destroy_all(struct cgroup *cgrp);
 void cgroup1_release_agent(struct work_struct *work);
diff --git a/kernel/cgroup/cgroup-v1.c b/kernel/cgroup/cgroup-v1.c
index a2c05d2476ac..e06c97f3ed1a 100644
--- a/kernel/cgroup/cgroup-v1.c
+++ b/kernel/cgroup/cgroup-v1.c
@@ -682,7 +682,7 @@ struct cftype cgroup1_base_files[] = {
 };
 
 /* Display information about each subsystem and each hierarchy */
-static int proc_cgroupstats_show(struct seq_file *m, void *v)
+int proc_cgroupstats_show(struct seq_file *m, void *v)
 {
         struct cgroup_subsys *ss;
         int i;
@@ -705,18 +705,6 @@ static int proc_cgroupstats_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int cgroupstats_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, proc_cgroupstats_show, NULL);
-}
-
-const struct file_operations proc_cgroupstats_operations = {
-        .open = cgroupstats_open,
-        .read = seq_read,
-        .llseek = seq_lseek,
-        .release = single_release,
-};
-
 /**
  * cgroupstats_build - build and fill cgroupstats
  * @stats: cgroupstats to fill information into
diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c
index a662bfcbea0e..12883656e63e 100644
--- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
@@ -5335,7 +5335,7 @@ int __init cgroup_init(void)
         WARN_ON(sysfs_create_mount_point(fs_kobj, "cgroup"));
         WARN_ON(register_filesystem(&cgroup_fs_type));
         WARN_ON(register_filesystem(&cgroup2_fs_type));
-        WARN_ON(!proc_create("cgroups", 0, NULL, &proc_cgroupstats_operations));
+        WARN_ON(!proc_create_single("cgroups", 0, NULL, proc_cgroupstats_show));
 
         return 0;
 }
diff --git a/kernel/dma.c b/kernel/dma.c
index 3506fc34a712..40f152936316 100644
--- a/kernel/dma.c
+++ b/kernel/dma.c
@@ -135,21 +135,9 @@ static int proc_dma_show(struct seq_file *m, void *v)
 }
 #endif /* MAX_DMA_CHANNELS */
 
-static int proc_dma_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, proc_dma_show, NULL);
-}
-
-static const struct file_operations proc_dma_operations = {
-        .open           = proc_dma_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static int __init proc_dma_init(void)
 {
-        proc_create("dma", 0, NULL, &proc_dma_operations);
+        proc_create_single("dma", 0, NULL, proc_dma_show);
         return 0;
 }
 
diff --git a/kernel/exec_domain.c b/kernel/exec_domain.c
index a5697119290e..33f07c5f2515 100644
--- a/kernel/exec_domain.c
+++ b/kernel/exec_domain.c
@@ -27,21 +27,9 @@ static int execdomains_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int execdomains_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, execdomains_proc_show, NULL);
-}
-
-static const struct file_operations execdomains_proc_fops = {
-        .open           = execdomains_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static int __init proc_execdomains_init(void)
 {
-        proc_create("execdomains", 0, NULL, &execdomains_proc_fops);
+        proc_create_single("execdomains", 0, NULL, execdomains_proc_show);
         return 0;
 }
 module_init(proc_execdomains_init);
diff --git a/kernel/irq/proc.c b/kernel/irq/proc.c
index 7cb091d81d91..37eda10f5c36 100644
--- a/kernel/irq/proc.c
+++ b/kernel/irq/proc.c
@@ -185,11 +185,6 @@ static int irq_affinity_list_proc_open(struct inode *inode, struct file *file)
         return single_open(file, irq_affinity_list_proc_show, PDE_DATA(inode));
 }
 
-static int irq_affinity_hint_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, irq_affinity_hint_proc_show, PDE_DATA(inode));
-}
-
 static const struct file_operations irq_affinity_proc_fops = {
         .open           = irq_affinity_proc_open,
         .read           = seq_read,
@@ -198,13 +193,6 @@ static const struct file_operations irq_affinity_proc_fops = {
         .write          = irq_affinity_proc_write,
 };
 
-static const struct file_operations irq_affinity_hint_proc_fops = {
-        .open           = irq_affinity_hint_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static const struct file_operations irq_affinity_list_proc_fops = {
         .open           = irq_affinity_list_proc_open,
         .read           = seq_read,
@@ -223,32 +211,6 @@ static int irq_effective_aff_list_proc_show(struct seq_file *m, void *v)
 {
         return show_irq_affinity(EFFECTIVE_LIST, m);
 }
-
-static int irq_effective_aff_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, irq_effective_aff_proc_show, PDE_DATA(inode));
-}
-
-static int irq_effective_aff_list_proc_open(struct inode *inode,
-                                            struct file *file)
-{
-        return single_open(file, irq_effective_aff_list_proc_show,
-                           PDE_DATA(inode));
-}
-
-static const struct file_operations irq_effective_aff_proc_fops = {
-        .open           = irq_effective_aff_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
-static const struct file_operations irq_effective_aff_list_proc_fops = {
-        .open           = irq_effective_aff_list_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
 #endif
 
 static int default_affinity_show(struct seq_file *m, void *v)
@@ -313,18 +275,6 @@ static int irq_node_proc_show(struct seq_file *m, void *v)
         seq_printf(m, "%d\n", irq_desc_get_node(desc));
         return 0;
 }
-
-static int irq_node_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, irq_node_proc_show, PDE_DATA(inode));
-}
-
-static const struct file_operations irq_node_proc_fops = {
-        .open           = irq_node_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
 #endif
 
 static int irq_spurious_proc_show(struct seq_file *m, void *v)
@@ -337,18 +287,6 @@ static int irq_spurious_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int irq_spurious_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, irq_spurious_proc_show, PDE_DATA(inode));
-}
-
-static const struct file_operations irq_spurious_proc_fops = {
-        .open           = irq_spurious_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 #define MAX_NAMELEN 128
 
 static int name_unique(unsigned int irq, struct irqaction *new_action)
@@ -421,24 +359,24 @@ void register_irq_proc(unsigned int irq, struct irq_desc *desc)
                          &irq_affinity_proc_fops, irqp);
 
         /* create /proc/irq/<irq>/affinity_hint */
-        proc_create_data("affinity_hint", 0444, desc->dir,
-                         &irq_affinity_hint_proc_fops, irqp);
+        proc_create_single_data("affinity_hint", 0444, desc->dir,
+                        irq_affinity_hint_proc_show, irqp);
 
         /* create /proc/irq/<irq>/smp_affinity_list */
         proc_create_data("smp_affinity_list", 0644, desc->dir,
                          &irq_affinity_list_proc_fops, irqp);
 
-        proc_create_data("node", 0444, desc->dir,
-                         &irq_node_proc_fops, irqp);
+        proc_create_single_data("node", 0444, desc->dir, irq_node_proc_show,
+                        irqp);
 # ifdef CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK
-        proc_create_data("effective_affinity", 0444, desc->dir,
-                         &irq_effective_aff_proc_fops, irqp);
-        proc_create_data("effective_affinity_list", 0444, desc->dir,
-                         &irq_effective_aff_list_proc_fops, irqp);
+        proc_create_single_data("effective_affinity", 0444, desc->dir,
+                        irq_effective_aff_proc_show, irqp);
+        proc_create_single_data("effective_affinity_list", 0444, desc->dir,
+                        irq_effective_aff_list_proc_show, irqp);
 # endif
 #endif
-        proc_create_data("spurious", 0444, desc->dir,
-                         &irq_spurious_proc_fops, (void *)(long)irq);
+        proc_create_single_data("spurious", 0444, desc->dir,
+                        irq_spurious_proc_show, (void *)(long)irq);
 
 out_unlock:
         mutex_unlock(&register_lock);
diff --git a/kernel/locking/lockdep_proc.c b/kernel/locking/lockdep_proc.c
index ad69bbc9bd28..3dd980dfba2d 100644
--- a/kernel/locking/lockdep_proc.c
+++ b/kernel/locking/lockdep_proc.c
@@ -101,18 +101,6 @@ static const struct seq_operations lockdep_ops = {
         .show   = l_show,
 };
 
-static int lockdep_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &lockdep_ops);
-}
-
-static const struct file_operations proc_lockdep_operations = {
-        .open           = lockdep_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release,
-};
-
 #ifdef CONFIG_PROVE_LOCKING
 static void *lc_start(struct seq_file *m, loff_t *pos)
 {
@@ -170,18 +158,6 @@ static const struct seq_operations lockdep_chains_ops = {
         .stop   = lc_stop,
         .show   = lc_show,
 };
-
-static int lockdep_chains_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &lockdep_chains_ops);
-}
-
-static const struct file_operations proc_lockdep_chains_operations = {
-        .open           = lockdep_chains_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release,
-};
 #endif /* CONFIG_PROVE_LOCKING */
 
 static void lockdep_stats_debug_show(struct seq_file *m)
@@ -355,18 +331,6 @@ static int lockdep_stats_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int lockdep_stats_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, lockdep_stats_show, NULL);
-}
-
-static const struct file_operations proc_lockdep_stats_operations = {
-        .open           = lockdep_stats_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 #ifdef CONFIG_LOCK_STAT
 
 struct lock_stat_data {
@@ -682,14 +646,11 @@ static const struct file_operations proc_lock_stat_operations = {
 
 static int __init lockdep_proc_init(void)
 {
-        proc_create("lockdep", S_IRUSR, NULL, &proc_lockdep_operations);
+        proc_create_seq("lockdep", S_IRUSR, NULL, &lockdep_ops);
 #ifdef CONFIG_PROVE_LOCKING
-        proc_create("lockdep_chains", S_IRUSR, NULL,
-                    &proc_lockdep_chains_operations);
+        proc_create_seq("lockdep_chains", S_IRUSR, NULL, &lockdep_chains_ops);
 #endif
-        proc_create("lockdep_stats", S_IRUSR, NULL,
-                    &proc_lockdep_stats_operations);
-
+        proc_create_single("lockdep_stats", S_IRUSR, NULL, lockdep_stats_show);
 #ifdef CONFIG_LOCK_STAT
         proc_create("lock_stat", S_IRUSR | S_IWUSR, NULL,
                     &proc_lock_stat_operations);
diff --git a/kernel/resource.c b/kernel/resource.c
index 2af6c03858b9..b589dda910b3 100644
--- a/kernel/resource.c
+++ b/kernel/resource.c
@@ -87,7 +87,7 @@ enum { MAX_IORES_LEVEL = 5 };
 static void *r_start(struct seq_file *m, loff_t *pos)
         __acquires(resource_lock)
 {
-        struct resource *p = m->private;
+        struct resource *p = PDE_DATA(file_inode(m->file));
         loff_t l = 0;
         read_lock(&resource_lock);
         for (p = p->child; p && l < *pos; p = r_next(m, p, &l))
@@ -103,7 +103,7 @@ static void r_stop(struct seq_file *m, void *v)
 
 static int r_show(struct seq_file *m, void *v)
 {
-        struct resource *root = m->private;
+        struct resource *root = PDE_DATA(file_inode(m->file));
         struct resource *r = v, *p;
         unsigned long long start, end;
         int width = root->end < 0x10000 ? 4 : 8;
@@ -135,44 +135,11 @@ static const struct seq_operations resource_op = {
         .show   = r_show,
 };
 
-static int ioports_open(struct inode *inode, struct file *file)
-{
-        int res = seq_open(file, &resource_op);
-        if (!res) {
-                struct seq_file *m = file->private_data;
-                m->private = &ioport_resource;
-        }
-        return res;
-}
-
-static int iomem_open(struct inode *inode, struct file *file)
-{
-        int res = seq_open(file, &resource_op);
-        if (!res) {
-                struct seq_file *m = file->private_data;
-                m->private = &iomem_resource;
-        }
-        return res;
-}
-
-static const struct file_operations proc_ioports_operations = {
-        .open           = ioports_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release,
-};
-
-static const struct file_operations proc_iomem_operations = {
-        .open           = iomem_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release,
-};
-
 static int __init ioresources_init(void)
 {
-        proc_create("ioports", 0, NULL, &proc_ioports_operations);
-        proc_create("iomem", 0, NULL, &proc_iomem_operations);
+        proc_create_seq_data("ioports", 0, NULL, &resource_op,
+                        &ioport_resource);
+        proc_create_seq_data("iomem", 0, NULL, &resource_op, &iomem_resource);
         return 0;
 }
 __initcall(ioresources_init);
diff --git a/kernel/sched/debug.c b/kernel/sched/debug.c
index 15b10e210a6b..e593b4118578 100644
--- a/kernel/sched/debug.c
+++ b/kernel/sched/debug.c
@@ -823,35 +823,9 @@ static const struct seq_operations sched_debug_sops = {
         .show           = sched_debug_show,
 };
 
-static int sched_debug_release(struct inode *inode, struct file *file)
-{
-        seq_release(inode, file);
-
-        return 0;
-}
-
-static int sched_debug_open(struct inode *inode, struct file *filp)
-{
-        int ret = 0;
-
-        ret = seq_open(filp, &sched_debug_sops);
-
-        return ret;
-}
-
-static const struct file_operations sched_debug_fops = {
-        .open           = sched_debug_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = sched_debug_release,
-};
-
 static int __init init_sched_debug_procfs(void)
 {
-        struct proc_dir_entry *pe;
-
-        pe = proc_create("sched_debug", 0444, NULL, &sched_debug_fops);
-        if (!pe)
+        if (!proc_create_seq("sched_debug", 0444, NULL, &sched_debug_sops))
                 return -ENOMEM;
         return 0;
 }
diff --git a/kernel/sched/stats.c b/kernel/sched/stats.c
index ab112cbfd7c8..750fb3c67eed 100644
--- a/kernel/sched/stats.c
+++ b/kernel/sched/stats.c
@@ -120,22 +120,9 @@ static const struct seq_operations schedstat_sops = {
         .show  = show_schedstat,
 };
 
-static int schedstat_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &schedstat_sops);
-}
-
-static const struct file_operations proc_schedstat_operations = {
-        .open    = schedstat_open,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
-        .release = seq_release,
-};
-
 static int __init proc_schedstat_init(void)
 {
-        proc_create("schedstat", 0, NULL, &proc_schedstat_operations);
-
+        proc_create_seq("schedstat", 0, NULL, &schedstat_sops);
         return 0;
 }
 subsys_initcall(proc_schedstat_init);
diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c
index 0ed768b56c60..675c4e9563a9 100644
--- a/kernel/time/timer_list.c
+++ b/kernel/time/timer_list.c
@@ -372,24 +372,12 @@ static const struct seq_operations timer_list_sops = {
         .show = timer_list_show,
 };
 
-static int timer_list_open(struct inode *inode, struct file *filp)
-{
-        return seq_open_private(filp, &timer_list_sops,
-                        sizeof(struct timer_list_iter));
-}
-
-static const struct file_operations timer_list_fops = {
-        .open           = timer_list_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release_private,
-};
-
 static int __init init_timer_list_procfs(void)
 {
         struct proc_dir_entry *pe;
 
-        pe = proc_create("timer_list", 0400, NULL, &timer_list_fops);
+        pe = proc_create_seq_private("timer_list", 0400, NULL, &timer_list_sops,
+                        sizeof(struct timer_list_iter), NULL);
         if (!pe)
                 return -ENOMEM;
         return 0;
diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index ebff729cc956..63a5f502da08 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -2751,25 +2751,14 @@ static const struct seq_operations vmalloc_op = {
         .show = s_show,
 };
 
-static int vmalloc_open(struct inode *inode, struct file *file)
+static int __init proc_vmalloc_init(void)
 {
         if (IS_ENABLED(CONFIG_NUMA))
-                return seq_open_private(file, &vmalloc_op,
-                                        nr_node_ids * sizeof(unsigned int));
+                proc_create_seq_private("vmallocinfo", S_IRUSR, NULL,
+                                &vmalloc_op,
+                                nr_node_ids * sizeof(unsigned int), NULL);
         else
-                return seq_open(file, &vmalloc_op);
-}
-
-static const struct file_operations proc_vmalloc_operations = {
-        .open           = vmalloc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release_private,
-};
-
-static int __init proc_vmalloc_init(void)
-{
-        proc_create("vmallocinfo", S_IRUSR, NULL, &proc_vmalloc_operations);
+                proc_create_seq("vmallocinfo", S_IRUSR, NULL, &vmalloc_op);
         return 0;
 }
 module_init(proc_vmalloc_init);
diff --git a/mm/vmstat.c b/mm/vmstat.c
index a2b9518980ce..75eda9c2b260 100644
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -1516,18 +1516,6 @@ static const struct seq_operations fragmentation_op = {
         .show   = frag_show,
 };
 
-static int fragmentation_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &fragmentation_op);
-}
-
-static const struct file_operations buddyinfo_file_operations = {
-        .open           = fragmentation_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release,
-};
-
 static const struct seq_operations pagetypeinfo_op = {
         .start  = frag_start,
         .next   = frag_next,
@@ -1535,18 +1523,6 @@ static const struct seq_operations pagetypeinfo_op = {
         .show   = pagetypeinfo_show,
 };
 
-static int pagetypeinfo_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &pagetypeinfo_op);
-}
-
-static const struct file_operations pagetypeinfo_file_operations = {
-        .open           = pagetypeinfo_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release,
-};
-
 static bool is_zone_first_populated(pg_data_t *pgdat, struct zone *zone)
 {
         int zid;
@@ -1663,18 +1639,6 @@ static const struct seq_operations zoneinfo_op = {
         .show   = zoneinfo_show,
 };
 
-static int zoneinfo_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &zoneinfo_op);
-}
-
-static const struct file_operations zoneinfo_file_operations = {
-        .open           = zoneinfo_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release,
-};
-
 enum writeback_stat_item {
         NR_DIRTY_THRESHOLD,
         NR_DIRTY_BG_THRESHOLD,
@@ -1762,18 +1726,6 @@ static const struct seq_operations vmstat_op = {
         .stop   = vmstat_stop,
         .show   = vmstat_show,
 };
-
-static int vmstat_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &vmstat_op);
-}
-
-static const struct file_operations vmstat_file_operations = {
-        .open           = vmstat_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release,
-};
 #endif /* CONFIG_PROC_FS */
 
 #ifdef CONFIG_SMP
@@ -2020,10 +1972,10 @@ void __init init_mm_internals(void)
         start_shepherd_timer();
 #endif
 #ifdef CONFIG_PROC_FS
-        proc_create("buddyinfo", 0444, NULL, &buddyinfo_file_operations);
-        proc_create("pagetypeinfo", 0444, NULL, &pagetypeinfo_file_operations);
-        proc_create("vmstat", 0444, NULL, &vmstat_file_operations);
-        proc_create("zoneinfo", 0444, NULL, &zoneinfo_file_operations);
+        proc_create_seq("buddyinfo", 0444, NULL, &fragmentation_op);
+        proc_create_seq("pagetypeinfo", 0444, NULL, &pagetypeinfo_op);
+        proc_create_seq("vmstat", 0444, NULL, &vmstat_op);
+        proc_create_seq("zoneinfo", 0444, NULL, &zoneinfo_op);
 #endif
 }
 
diff --git a/net/8021q/vlanproc.c b/net/8021q/vlanproc.c
index a627a5db2125..d36e8c4b7f56 100644
--- a/net/8021q/vlanproc.c
+++ b/net/8021q/vlanproc.c
@@ -73,35 +73,6 @@ static const struct seq_operations vlan_seq_ops = {
         .show = vlan_seq_show,
 };
 
-static int vlan_seq_open(struct inode *inode, struct file *file)
-{
-        return seq_open_net(inode, file, &vlan_seq_ops,
-                        sizeof(struct seq_net_private));
-}
-
-static const struct file_operations vlan_fops = {
-        .open    = vlan_seq_open,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
-        .release = seq_release_net,
-};
-
-/*
- *      /proc/net/vlan/<device> file and inode operations
- */
-
-static int vlandev_seq_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, vlandev_seq_show, PDE_DATA(inode));
-}
-
-static const struct file_operations vlandev_fops = {
-        .open    = vlandev_seq_open,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
-        .release = single_release,
-};
-
 /*
  * Proc filesystem directory entries.
  */
@@ -148,8 +119,9 @@ int __net_init vlan_proc_init(struct net *net)
         if (!vn->proc_vlan_dir)
                 goto err;
 
-        vn->proc_vlan_conf = proc_create(name_conf, S_IFREG | 0600,
-                                         vn->proc_vlan_dir, &vlan_fops);
+        vn->proc_vlan_conf = proc_create_net(name_conf, S_IFREG | 0600,
+                        vn->proc_vlan_dir, &vlan_seq_ops,
+                        sizeof(struct seq_net_private));
         if (!vn->proc_vlan_conf)
                 goto err;
         return 0;
@@ -171,9 +143,8 @@ int vlan_proc_add_dev(struct net_device *vlandev)
 
         if (!strcmp(vlandev->name, name_conf))
                 return -EINVAL;
-        vlan->dent =
-                proc_create_data(vlandev->name, S_IFREG | 0600,
-                                 vn->proc_vlan_dir, &vlandev_fops, vlandev);
+        vlan->dent = proc_create_single_data(vlandev->name, S_IFREG | 0600,
+                        vn->proc_vlan_dir, vlandev_seq_show, vlandev);
         if (!vlan->dent)
                 return -ENOBUFS;
         return 0;
diff --git a/net/appletalk/aarp.c b/net/appletalk/aarp.c
index d4c1021e74e1..49a16cee2aae 100644
--- a/net/appletalk/aarp.c
+++ b/net/appletalk/aarp.c
@@ -907,11 +907,6 @@ void aarp_device_down(struct net_device *dev)
 }
 
 #ifdef CONFIG_PROC_FS
-struct aarp_iter_state {
-        int bucket;
-        struct aarp_entry **table;
-};
-
 /*
  * Get the aarp entry that is in the chain described
  * by the iterator.
@@ -1033,25 +1028,12 @@ static int aarp_seq_show(struct seq_file *seq, void *v)
         return 0;
 }
 
-static const struct seq_operations aarp_seq_ops = {
+const struct seq_operations aarp_seq_ops = {
         .start  = aarp_seq_start,
         .next   = aarp_seq_next,
         .stop   = aarp_seq_stop,
         .show   = aarp_seq_show,
 };
-
-static int aarp_seq_open(struct inode *inode, struct file *file)
-{
-        return seq_open_private(file, &aarp_seq_ops,
-                        sizeof(struct aarp_iter_state));
-}
-
-const struct file_operations atalk_seq_arp_fops = {
-        .open           = aarp_seq_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release_private,
-};
 #endif
 
 /* General module cleanup. Called from cleanup_module() in ddp.c. */
diff --git a/net/appletalk/atalk_proc.c b/net/appletalk/atalk_proc.c
index 7214aea14cb3..8006295f8bd7 100644
--- a/net/appletalk/atalk_proc.c
+++ b/net/appletalk/atalk_proc.c
@@ -210,42 +210,6 @@ static const struct seq_operations atalk_seq_socket_ops = {
         .show   = atalk_seq_socket_show,
 };
 
-static int atalk_seq_interface_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &atalk_seq_interface_ops);
-}
-
-static int atalk_seq_route_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &atalk_seq_route_ops);
-}
-
-static int atalk_seq_socket_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &atalk_seq_socket_ops);
-}
-
-static const struct file_operations atalk_seq_interface_fops = {
-        .open           = atalk_seq_interface_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release,
-};
-
-static const struct file_operations atalk_seq_route_fops = {
-        .open           = atalk_seq_route_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release,
-};
-
-static const struct file_operations atalk_seq_socket_fops = {
-        .open           = atalk_seq_socket_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release,
-};
-
 static struct proc_dir_entry *atalk_proc_dir;
 
 int __init atalk_proc_init(void)
@@ -257,22 +221,23 @@ int __init atalk_proc_init(void)
         if (!atalk_proc_dir)
                 goto out;
 
-        p = proc_create("interface", 0444, atalk_proc_dir,
-                        &atalk_seq_interface_fops);
+        p = proc_create_seq("interface", 0444, atalk_proc_dir,
+                        &atalk_seq_interface_ops);
         if (!p)
                 goto out_interface;
 
-        p = proc_create("route", 0444, atalk_proc_dir,
-                        &atalk_seq_route_fops);
+        p = proc_create_seq("route", 0444, atalk_proc_dir,
+                        &atalk_seq_route_ops);
         if (!p)
                 goto out_route;
 
-        p = proc_create("socket", 0444, atalk_proc_dir,
-                        &atalk_seq_socket_fops);
+        p = proc_create_seq("socket", 0444, atalk_proc_dir,
+                        &atalk_seq_socket_ops);
         if (!p)
                 goto out_socket;
 
-        p = proc_create("arp", 0444, atalk_proc_dir, &atalk_seq_arp_fops);
+        p = proc_create_seq_private("arp", 0444, atalk_proc_dir, &aarp_seq_ops,
+                        sizeof(struct aarp_iter_state), NULL);
         if (!p)
                 goto out_arp;
 
diff --git a/net/atm/br2684.c b/net/atm/br2684.c
index fd94bea36ee8..36b3adacc0dd 100644
--- a/net/atm/br2684.c
+++ b/net/atm/br2684.c
@@ -818,18 +818,6 @@ static const struct seq_operations br2684_seq_ops = {
         .show = br2684_seq_show,
 };
 
-static int br2684_proc_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &br2684_seq_ops);
-}
-
-static const struct file_operations br2684_proc_ops = {
-        .open = br2684_proc_open,
-        .read = seq_read,
-        .llseek = seq_lseek,
-        .release = seq_release,
-};
-
 extern struct proc_dir_entry *atm_proc_root;    /* from proc.c */
 #endif /* CONFIG_PROC_FS */
 
@@ -837,7 +825,7 @@ static int __init br2684_init(void)
 {
 #ifdef CONFIG_PROC_FS
         struct proc_dir_entry *p;
-        p = proc_create("br2684", 0, atm_proc_root, &br2684_proc_ops);
+        p = proc_create_seq("br2684", 0, atm_proc_root, &br2684_seq_ops);
         if (p == NULL)
                 return -ENOMEM;
 #endif
diff --git a/net/atm/clip.c b/net/atm/clip.c
index f07dbc632222..66caa48a27c2 100644
--- a/net/atm/clip.c
+++ b/net/atm/clip.c
@@ -863,20 +863,6 @@ static const struct seq_operations arp_seq_ops = {
         .stop   = neigh_seq_stop,
         .show   = clip_seq_show,
 };
-
-static int arp_seq_open(struct inode *inode, struct file *file)
-{
-        return seq_open_net(inode, file, &arp_seq_ops,
-                            sizeof(struct clip_seq_state));
-}
-
-static const struct file_operations arp_seq_fops = {
-        .open           = arp_seq_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release_net,
-        .owner          = THIS_MODULE
-};
 #endif
 
 static void atm_clip_exit_noproc(void);
@@ -893,7 +879,8 @@ static int __init atm_clip_init(void)
         {
                 struct proc_dir_entry *p;
 
-                p = proc_create("arp", 0444, atm_proc_root, &arp_seq_fops);
+                p = proc_create_net("arp", 0444, atm_proc_root, &arp_seq_ops,
+                                sizeof(struct clip_seq_state));
                 if (!p) {
                         pr_err("Unable to initialize /proc/net/atm/arp\n");
                         atm_clip_exit_noproc();
diff --git a/net/atm/lec.c b/net/atm/lec.c
index 3138a869b5c0..5a95fcf6f9b6 100644
--- a/net/atm/lec.c
+++ b/net/atm/lec.c
@@ -990,18 +990,6 @@ static const struct seq_operations lec_seq_ops = {
         .stop = lec_seq_stop,
         .show = lec_seq_show,
 };
-
-static int lec_seq_open(struct inode *inode, struct file *file)
-{
-        return seq_open_private(file, &lec_seq_ops, sizeof(struct lec_state));
-}
-
-static const struct file_operations lec_seq_fops = {
-        .open = lec_seq_open,
-        .read = seq_read,
-        .llseek = seq_lseek,
-        .release = seq_release_private,
-};
 #endif
 
 static int lane_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
@@ -1047,7 +1035,8 @@ static int __init lane_module_init(void)
 #ifdef CONFIG_PROC_FS
         struct proc_dir_entry *p;
 
-        p = proc_create("lec", 0444, atm_proc_root, &lec_seq_fops);
+        p = proc_create_seq_private("lec", 0444, atm_proc_root, &lec_seq_ops,
+                        sizeof(struct lec_state), NULL);
         if (!p) {
                 pr_err("Unable to initialize /proc/net/atm/lec\n");
                 return -ENOMEM;
diff --git a/net/atm/proc.c b/net/atm/proc.c
index 55410c00c7e2..0b0495a41bbe 100644
--- a/net/atm/proc.c
+++ b/net/atm/proc.c
@@ -68,7 +68,6 @@ static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
 struct vcc_state {
         int bucket;
         struct sock *sk;
-        int family;
 };
 
 static inline int compare_family(struct sock *sk, int family)
@@ -106,23 +105,13 @@ out:
         return (l < 0);
 }
 
-static inline void *vcc_walk(struct vcc_state *state, loff_t l)
+static inline void *vcc_walk(struct seq_file *seq, loff_t l)
 {
-        return __vcc_walk(&state->sk, state->family, &state->bucket, l) ?
-               state : NULL;
-}
-
-static int __vcc_seq_open(struct inode *inode, struct file *file,
-        int family, const struct seq_operations *ops)
-{
-        struct vcc_state *state;
-
-        state = __seq_open_private(file, ops, sizeof(*state));
-        if (state == NULL)
-                return -ENOMEM;
+        struct vcc_state *state = seq->private;
+        int family = (uintptr_t)(PDE_DATA(file_inode(seq->file)));
 
-        state->family = family;
-        return 0;
+        return __vcc_walk(&state->sk, family, &state->bucket, l) ?
+               state : NULL;
 }
 
 static void *vcc_seq_start(struct seq_file *seq, loff_t *pos)
@@ -133,7 +122,7 @@ static void *vcc_seq_start(struct seq_file *seq, loff_t *pos)
 
         read_lock(&vcc_sklist_lock);
         state->sk = SEQ_START_TOKEN;
-        return left ? vcc_walk(state, left) : SEQ_START_TOKEN;
+        return left ? vcc_walk(seq, left) : SEQ_START_TOKEN;
 }
 
 static void vcc_seq_stop(struct seq_file *seq, void *v)
@@ -144,9 +133,7 @@ static void vcc_seq_stop(struct seq_file *seq, void *v)
 
 static void *vcc_seq_next(struct seq_file *seq, void *v, loff_t *pos)
 {
-        struct vcc_state *state = seq->private;
-
-        v = vcc_walk(state, 1);
+        v = vcc_walk(seq, 1);
         *pos += !!PTR_ERR(v);
         return v;
 }
@@ -257,18 +244,6 @@ static const struct seq_operations atm_dev_seq_ops = {
         .show   = atm_dev_seq_show,
 };
 
-static int atm_dev_seq_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &atm_dev_seq_ops);
-}
-
-static const struct file_operations devices_seq_fops = {
-        .open           = atm_dev_seq_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release,
-};
-
 static int pvc_seq_show(struct seq_file *seq, void *v)
 {
         static char atm_pvc_banner[] =
@@ -292,18 +267,6 @@ static const struct seq_operations pvc_seq_ops = {
         .show   = pvc_seq_show,
 };
 
-static int pvc_seq_open(struct inode *inode, struct file *file)
-{
-        return __vcc_seq_open(inode, file, PF_ATMPVC, &pvc_seq_ops);
-}
-
-static const struct file_operations pvc_seq_fops = {
-        .open           = pvc_seq_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release_private,
-};
-
 static int vcc_seq_show(struct seq_file *seq, void *v)
 {
         if (v == SEQ_START_TOKEN) {
@@ -326,18 +289,6 @@ static const struct seq_operations vcc_seq_ops = {
         .show   = vcc_seq_show,
 };
 
-static int vcc_seq_open(struct inode *inode, struct file *file)
-{
-        return __vcc_seq_open(inode, file, 0, &vcc_seq_ops);
-}
-
-static const struct file_operations vcc_seq_fops = {
-        .open           = vcc_seq_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release_private,
-};
-
 static int svc_seq_show(struct seq_file *seq, void *v)
 {
         static const char atm_svc_banner[] =
@@ -361,18 +312,6 @@ static const struct seq_operations svc_seq_ops = {
         .show   = svc_seq_show,
 };
 
-static int svc_seq_open(struct inode *inode, struct file *file)
-{
-        return __vcc_seq_open(inode, file, PF_ATMSVC, &svc_seq_ops);
-}
-
-static const struct file_operations svc_seq_fops = {
-        .open           = svc_seq_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release_private,
-};
-
 static ssize_t proc_dev_atm_read(struct file *file, char __user *buf,
                                  size_t count, loff_t *pos)
 {
@@ -440,58 +379,22 @@ void atm_proc_dev_deregister(struct atm_dev *dev)
         kfree(dev->proc_name);
 }
 
-static struct atm_proc_entry {
-        char *name;
-        const struct file_operations *proc_fops;
-        struct proc_dir_entry *dirent;
-} atm_proc_ents[] = {
-        { .name = "devices",    .proc_fops = &devices_seq_fops },
-        { .name = "pvc",        .proc_fops = &pvc_seq_fops },
-        { .name = "svc",        .proc_fops = &svc_seq_fops },
-        { .name = "vc",         .proc_fops = &vcc_seq_fops },
-        { .name = NULL,         .proc_fops = NULL }
-};
-
-static void atm_proc_dirs_remove(void)
-{
-        static struct atm_proc_entry *e;
-
-        for (e = atm_proc_ents; e->name; e++) {
-                if (e->dirent)
-                        remove_proc_entry(e->name, atm_proc_root);
-        }
-        remove_proc_entry("atm", init_net.proc_net);
-}
-
 int __init atm_proc_init(void)
 {
-        static struct atm_proc_entry *e;
-        int ret;
-
         atm_proc_root = proc_net_mkdir(&init_net, "atm", init_net.proc_net);
         if (!atm_proc_root)
-                goto err_out;
-        for (e = atm_proc_ents; e->name; e++) {
-                struct proc_dir_entry *dirent;
-
-                dirent = proc_create(e->name, 0444,
-                                     atm_proc_root, e->proc_fops);
-                if (!dirent)
-                        goto err_out_remove;
-                e->dirent = dirent;
-        }
-        ret = 0;
-out:
-        return ret;
-
-err_out_remove:
-        atm_proc_dirs_remove();
-err_out:
-        ret = -ENOMEM;
-        goto out;
+                return -ENOMEM;
+        proc_create_seq("devices", 0444, atm_proc_root, &atm_dev_seq_ops);
+        proc_create_seq_private("pvc", 0444, atm_proc_root, &pvc_seq_ops,
+                        sizeof(struct vcc_state), (void *)(uintptr_t)PF_ATMPVC);
+        proc_create_seq_private("svc", 0444, atm_proc_root, &svc_seq_ops,
+                        sizeof(struct vcc_state), (void *)(uintptr_t)PF_ATMSVC);
+        proc_create_seq_private("vc", 0444, atm_proc_root, &vcc_seq_ops,
+                        sizeof(struct vcc_state), NULL);
+        return 0;
 }
 
 void atm_proc_exit(void)
 {
-        atm_proc_dirs_remove();
+        remove_proc_subtree("atm", init_net.proc_net);
 }
diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c
index 2b41366fcad2..c603d33d5410 100644
--- a/net/ax25/af_ax25.c
+++ b/net/ax25/af_ax25.c
@@ -1924,19 +1924,6 @@ static const struct seq_operations ax25_info_seqops = {
         .stop = ax25_info_stop,
         .show = ax25_info_show,
 };
-
-static int ax25_info_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &ax25_info_seqops);
-}
-
-static const struct file_operations ax25_info_fops = {
-        .open = ax25_info_open,
-        .read = seq_read,
-        .llseek = seq_lseek,
-        .release = seq_release,
-};
-
 #endif
 
 static const struct net_proto_family ax25_family_ops = {
@@ -1989,10 +1976,10 @@ static int __init ax25_init(void)
         dev_add_pack(&ax25_packet_type);
         register_netdevice_notifier(&ax25_dev_notifier);
 
-        proc_create("ax25_route", 0444, init_net.proc_net,
-                    &ax25_route_fops);
-        proc_create("ax25", 0444, init_net.proc_net, &ax25_info_fops);
-        proc_create("ax25_calls", 0444, init_net.proc_net, &ax25_uid_fops);
+        proc_create_seq("ax25_route", 0444, init_net.proc_net, &ax25_rt_seqops);
+        proc_create_seq("ax25", 0444, init_net.proc_net, &ax25_info_seqops);
+        proc_create_seq("ax25_calls", 0444, init_net.proc_net,
+                        &ax25_uid_seqops);
 out:
         return rc;
 }
diff --git a/net/ax25/ax25_route.c b/net/ax25/ax25_route.c
index 525558972fd9..a0eff323af12 100644
--- a/net/ax25/ax25_route.c
+++ b/net/ax25/ax25_route.c
@@ -323,25 +323,12 @@ static int ax25_rt_seq_show(struct seq_file *seq, void *v)
         return 0;
 }
 
-static const struct seq_operations ax25_rt_seqops = {
+const struct seq_operations ax25_rt_seqops = {
         .start = ax25_rt_seq_start,
         .next = ax25_rt_seq_next,
         .stop = ax25_rt_seq_stop,
         .show = ax25_rt_seq_show,
 };
-
-static int ax25_rt_info_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &ax25_rt_seqops);
-}
-
-const struct file_operations ax25_route_fops = {
-        .open = ax25_rt_info_open,
-        .read = seq_read,
-        .llseek = seq_lseek,
-        .release = seq_release,
-};
-
 #endif
 
 /*
diff --git a/net/ax25/ax25_uid.c b/net/ax25/ax25_uid.c
index 4ebe91ba317a..99d02e390e43 100644
--- a/net/ax25/ax25_uid.c
+++ b/net/ax25/ax25_uid.c
@@ -181,25 +181,12 @@ static int ax25_uid_seq_show(struct seq_file *seq, void *v)
         return 0;
 }
 
-static const struct seq_operations ax25_uid_seqops = {
+const struct seq_operations ax25_uid_seqops = {
         .start = ax25_uid_seq_start,
         .next = ax25_uid_seq_next,
         .stop = ax25_uid_seq_stop,
         .show = ax25_uid_seq_show,
 };
-
-static int ax25_uid_info_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &ax25_uid_seqops);
-}
-
-const struct file_operations ax25_uid_fops = {
-        .open = ax25_uid_info_open,
-        .read = seq_read,
-        .llseek = seq_lseek,
-        .release = seq_release,
-};
-
 #endif
 
 /*
diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c
index 84d92a077834..3264e1873219 100644
--- a/net/bluetooth/af_bluetooth.c
+++ b/net/bluetooth/af_bluetooth.c
@@ -605,15 +605,10 @@ int bt_sock_wait_ready(struct sock *sk, unsigned long flags)
 EXPORT_SYMBOL(bt_sock_wait_ready);
 
 #ifdef CONFIG_PROC_FS
-struct bt_seq_state {
-        struct bt_sock_list *l;
-};
-
 static void *bt_seq_start(struct seq_file *seq, loff_t *pos)
         __acquires(seq->private->l->lock)
 {
-        struct bt_seq_state *s = seq->private;
-        struct bt_sock_list *l = s->l;
+        struct bt_sock_list *l = PDE_DATA(file_inode(seq->file));
 
         read_lock(&l->lock);
         return seq_hlist_start_head(&l->head, *pos);
@@ -621,8 +616,7 @@ static void *bt_seq_start(struct seq_file *seq, loff_t *pos)
 
 static void *bt_seq_next(struct seq_file *seq, void *v, loff_t *pos)
 {
-        struct bt_seq_state *s = seq->private;
-        struct bt_sock_list *l = s->l;
+        struct bt_sock_list *l = PDE_DATA(file_inode(seq->file));
 
         return seq_hlist_next(v, &l->head, pos);
 }
@@ -630,16 +624,14 @@ static void *bt_seq_next(struct seq_file *seq, void *v, loff_t *pos)
 static void bt_seq_stop(struct seq_file *seq, void *v)
         __releases(seq->private->l->lock)
 {
-        struct bt_seq_state *s = seq->private;
-        struct bt_sock_list *l = s->l;
+        struct bt_sock_list *l = PDE_DATA(file_inode(seq->file));
 
         read_unlock(&l->lock);
 }
 
 static int bt_seq_show(struct seq_file *seq, void *v)
 {
-        struct bt_seq_state *s = seq->private;
-        struct bt_sock_list *l = s->l;
+        struct bt_sock_list *l = PDE_DATA(file_inode(seq->file));
 
         if (v == SEQ_START_TOKEN) {
                 seq_puts(seq ,"sk               RefCnt Rmem   Wmem   User   Inode  Parent");
@@ -681,35 +673,13 @@ static const struct seq_operations bt_seq_ops = {
         .show  = bt_seq_show,
 };
 
-static int bt_seq_open(struct inode *inode, struct file *file)
-{
-        struct bt_sock_list *sk_list;
-        struct bt_seq_state *s;
-
-        sk_list = PDE_DATA(inode);
-        s = __seq_open_private(file, &bt_seq_ops,
-                               sizeof(struct bt_seq_state));
-        if (!s)
-                return -ENOMEM;
-
-        s->l = sk_list;
-        return 0;
-}
-
-static const struct file_operations bt_fops = {
-        .open = bt_seq_open,
-        .read = seq_read,
-        .llseek = seq_lseek,
-        .release = seq_release_private
-};
-
 int bt_procfs_init(struct net *net, const char *name,
                    struct bt_sock_list *sk_list,
                    int (* seq_show)(struct seq_file *, void *))
 {
         sk_list->custom_seq_show = seq_show;
 
-        if (!proc_create_data(name, 0, net->proc_net, &bt_fops, sk_list))
+        if (!proc_create_seq_data(name, 0, net->proc_net, &bt_seq_ops, sk_list))
                 return -ENOMEM;
         return 0;
 }
diff --git a/net/bluetooth/cmtp/capi.c b/net/bluetooth/cmtp/capi.c
index 426a92f02db4..eb41556002e3 100644
--- a/net/bluetooth/cmtp/capi.c
+++ b/net/bluetooth/cmtp/capi.c
@@ -521,18 +521,6 @@ static int cmtp_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int cmtp_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, cmtp_proc_show, PDE_DATA(inode));
-}
-
-static const struct file_operations cmtp_proc_fops = {
-        .open           = cmtp_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 int cmtp_attach_device(struct cmtp_session *session)
 {
         unsigned char buf[4];
@@ -571,7 +559,7 @@ int cmtp_attach_device(struct cmtp_session *session)
         session->ctrl.send_message  = cmtp_send_message;
 
         session->ctrl.procinfo      = cmtp_procinfo;
-        session->ctrl.proc_fops = &cmtp_proc_fops;
+        session->ctrl.proc_show     = cmtp_proc_show;
 
         if (attach_capi_ctr(&session->ctrl) < 0) {
                 BT_ERR("Can't attach new controller");
diff --git a/net/can/bcm.c b/net/can/bcm.c
index ac5e5e34fee3..6ad89f49b341 100644
--- a/net/can/bcm.c
+++ b/net/can/bcm.c
@@ -239,18 +239,6 @@ static int bcm_proc_show(struct seq_file *m, void *v)
         seq_putc(m, '\n');
         return 0;
 }
-
-static int bcm_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open_net(inode, file, bcm_proc_show);
-}
-
-static const struct file_operations bcm_proc_fops = {
-        .open           = bcm_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
 #endif /* CONFIG_PROC_FS */
 
 /*
@@ -1606,9 +1594,9 @@ static int bcm_connect(struct socket *sock, struct sockaddr *uaddr, int len,
         if (net->can.bcmproc_dir) {
                 /* unique socket address as filename */
                 sprintf(bo->procname, "%lu", sock_i_ino(sk));
-                bo->bcm_proc_read = proc_create_data(bo->procname, 0644,
+                bo->bcm_proc_read = proc_create_net_single(bo->procname, 0644,
                                                      net->can.bcmproc_dir,
-                                                     &bcm_proc_fops, sk);
+                                                     bcm_proc_show, sk);
                 if (!bo->bcm_proc_read) {
                         ret = -ENOMEM;
                         goto fail;
diff --git a/net/can/proc.c b/net/can/proc.c
index fdf704e9bb8c..70fea17bb04c 100644
--- a/net/can/proc.c
+++ b/net/can/proc.c
@@ -270,18 +270,6 @@ static int can_stats_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int can_stats_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open_net(inode, file, can_stats_proc_show);
-}
-
-static const struct file_operations can_stats_proc_fops = {
-        .open           = can_stats_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static int can_reset_stats_proc_show(struct seq_file *m, void *v)
 {
         struct net *net = m->private;
@@ -303,36 +291,12 @@ static int can_reset_stats_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int can_reset_stats_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open_net(inode, file, can_reset_stats_proc_show);
-}
-
-static const struct file_operations can_reset_stats_proc_fops = {
-        .open           = can_reset_stats_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static int can_version_proc_show(struct seq_file *m, void *v)
 {
         seq_printf(m, "%s\n", CAN_VERSION_STRING);
         return 0;
 }
 
-static int can_version_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open_net(inode, file, can_version_proc_show);
-}
-
-static const struct file_operations can_version_proc_fops = {
-        .open           = can_version_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static inline void can_rcvlist_proc_show_one(struct seq_file *m, int idx,
                                              struct net_device *dev,
                                              struct can_dev_rcv_lists *d)
@@ -373,18 +337,6 @@ static int can_rcvlist_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int can_rcvlist_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open_net(inode, file, can_rcvlist_proc_show);
-}
-
-static const struct file_operations can_rcvlist_proc_fops = {
-        .open           = can_rcvlist_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static inline void can_rcvlist_proc_show_array(struct seq_file *m,
                                                struct net_device *dev,
                                                struct hlist_head *rcv_array,
@@ -440,19 +392,6 @@ static int can_rcvlist_sff_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int can_rcvlist_sff_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open_net(inode, file, can_rcvlist_sff_proc_show);
-}
-
-static const struct file_operations can_rcvlist_sff_proc_fops = {
-        .open           = can_rcvlist_sff_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
-
 static int can_rcvlist_eff_proc_show(struct seq_file *m, void *v)
 {
         struct net_device *dev;
@@ -483,18 +422,6 @@ static int can_rcvlist_eff_proc_show(struct seq_file *m, void *v)
         return 0;
 }
 
-static int can_rcvlist_eff_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open_net(inode, file, can_rcvlist_eff_proc_show);
-}
-
-static const struct file_operations can_rcvlist_eff_proc_fops = {
-        .open           = can_rcvlist_eff_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 /*
  * can_init_proc - create main CAN proc directory and procfs entries
  */
@@ -510,37 +437,29 @@ void can_init_proc(struct net *net)
         }
 
         /* own procfs entries from the AF_CAN core */
-        net->can.pde_version     = proc_create(CAN_PROC_VERSION, 0644,
-                                               net->can.proc_dir,
-                                               &can_version_proc_fops);
-        net->can.pde_stats       = proc_create(CAN_PROC_STATS, 0644,
-                                               net->can.proc_dir,
-                                               &can_stats_proc_fops);
-        net->can.pde_reset_stats = proc_create(CAN_PROC_RESET_STATS, 0644,
-                                               net->can.proc_dir,
-                                               &can_reset_stats_proc_fops);
-        net->can.pde_rcvlist_err = proc_create_data(CAN_PROC_RCVLIST_ERR, 0644,
-                                                    net->can.proc_dir,
-                                                    &can_rcvlist_proc_fops,
-                                                    (void *)RX_ERR);
-        net->can.pde_rcvlist_all = proc_create_data(CAN_PROC_RCVLIST_ALL, 0644,
-                                                    net->can.proc_dir,
-                                                    &can_rcvlist_proc_fops,
-                                                    (void *)RX_ALL);
-        net->can.pde_rcvlist_fil = proc_create_data(CAN_PROC_RCVLIST_FIL, 0644,
-                                                    net->can.proc_dir,
-                                                    &can_rcvlist_proc_fops,
-                                                    (void *)RX_FIL);
-        net->can.pde_rcvlist_inv = proc_create_data(CAN_PROC_RCVLIST_INV, 0644,
-                                                    net->can.proc_dir,
-                                                    &can_rcvlist_proc_fops,
-                                                    (void *)RX_INV);
-        net->can.pde_rcvlist_eff = proc_create(CAN_PROC_RCVLIST_EFF, 0644,
-                                               net->can.proc_dir,
-                                               &can_rcvlist_eff_proc_fops);
-        net->can.pde_rcvlist_sff = proc_create(CAN_PROC_RCVLIST_SFF, 0644,
-                                               net->can.proc_dir,
-                                               &can_rcvlist_sff_proc_fops);
+        net->can.pde_version = proc_create_net_single(CAN_PROC_VERSION, 0644,
+                        net->can.proc_dir, can_version_proc_show, NULL);
+        net->can.pde_stats = proc_create_net_single(CAN_PROC_STATS, 0644,
+                        net->can.proc_dir, can_stats_proc_show, NULL);
+        net->can.pde_reset_stats = proc_create_net_single(CAN_PROC_RESET_STATS,
+                        0644, net->can.proc_dir, can_reset_stats_proc_show,
+                        NULL);
+        net->can.pde_rcvlist_err = proc_create_net_single(CAN_PROC_RCVLIST_ERR,
+                        0644, net->can.proc_dir, can_rcvlist_proc_show,
+                        (void *)RX_ERR);
+        net->can.pde_rcvlist_all = proc_create_net_single(CAN_PROC_RCVLIST_ALL,
+                        0644, net->can.proc_dir, can_rcvlist_proc_show,
+                        (void *)RX_ALL);
+        net->can.pde_rcvlist_fil = proc_create_net_single(CAN_PROC_RCVLIST_FIL,
+                        0644, net->can.proc_dir, can_rcvlist_proc_show,
+                        (void *)RX_FIL);
+        net->can.pde_rcvlist_inv = proc_create_net_single(CAN_PROC_RCVLIST_INV,
+                        0644, net->can.proc_dir, can_rcvlist_proc_show,
+                        (void *)RX_INV);
+        net->can.pde_rcvlist_eff = proc_create_net_single(CAN_PROC_RCVLIST_EFF,
+                        0644, net->can.proc_dir, can_rcvlist_eff_proc_show, NULL);
+        net->can.pde_rcvlist_sff = proc_create_net_single(CAN_PROC_RCVLIST_SFF,
+                        0644, net->can.proc_dir, can_rcvlist_sff_proc_show, NULL);
 }
 
 /*
diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index ce519861be59..1fb43bff417d 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -59,7 +59,7 @@ static int pneigh_ifdown_and_unlock(struct neigh_table *tbl,
                                     struct net_device *dev);
 
 #ifdef CONFIG_PROC_FS
-static const struct file_operations neigh_stat_seq_fops;
+static const struct seq_operations neigh_stat_seq_ops;
 #endif
 
 /*
@@ -1558,8 +1558,8 @@ void neigh_table_init(int index, struct neigh_table *tbl)
                 panic("cannot create neighbour cache statistics");
 
 #ifdef CONFIG_PROC_FS
-        if (!proc_create_data(tbl->id, 0, init_net.proc_net_stat,
-                              &neigh_stat_seq_fops, tbl))
+        if (!proc_create_seq_data(tbl->id, 0, init_net.proc_net_stat,
+                              &neigh_stat_seq_ops, tbl))
                 panic("cannot create neighbour proc dir entry");
 #endif
 
@@ -2786,7 +2786,7 @@ EXPORT_SYMBOL(neigh_seq_stop);
 
 static void *neigh_stat_seq_start(struct seq_file *seq, loff_t *pos)
 {
-        struct neigh_table *tbl = seq->private;
+        struct neigh_table *tbl = PDE_DATA(file_inode(seq->file));
         int cpu;
 
         if (*pos == 0)
@@ -2803,7 +2803,7 @@ static void *neigh_stat_seq_start(struct seq_file *seq, loff_t *pos)
 
 static void *neigh_stat_seq_next(struct seq_file *seq, void *v, loff_t *pos)
 {
-        struct neigh_table *tbl = seq->private;
+        struct neigh_table *tbl = PDE_DATA(file_inode(seq->file));
         int cpu;
 
         for (cpu = *pos; cpu < nr_cpu_ids; ++cpu) {
@@ -2822,7 +2822,7 @@ static void neigh_stat_seq_stop(struct seq_file *seq, void *v)
 
 static int neigh_stat_seq_show(struct seq_file *seq, void *v)
 {
-        struct neigh_table *tbl = seq->private;
+        struct neigh_table *tbl = PDE_DATA(file_inode(seq->file));
         struct neigh_statistics *st = v;
 
         if (v == SEQ_START_TOKEN) {
@@ -2861,25 +2861,6 @@ static const struct seq_operations neigh_stat_seq_ops = {
         .stop   = neigh_stat_seq_stop,
         .show   = neigh_stat_seq_show,
 };
-
-static int neigh_stat_seq_open(struct inode *inode, struct file *file)
-{
-        int ret = seq_open(file, &neigh_stat_seq_ops);
-
-        if (!ret) {
-                struct seq_file *sf = file->private_data;
-                sf->private = PDE_DATA(inode);
-        }
-        return ret;
-};
-
-static const struct file_operations neigh_stat_seq_fops = {
-        .open    = neigh_stat_seq_open,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
-        .release = seq_release,
-};
-
 #endif /* CONFIG_PROC_FS */
 
 static inline size_t neigh_nlmsg_size(void)
diff --git a/net/core/net-procfs.c b/net/core/net-procfs.c
index 9737302907b1..63881f72ef71 100644
--- a/net/core/net-procfs.c
+++ b/net/core/net-procfs.c
@@ -175,19 +175,6 @@ static const struct seq_operations dev_seq_ops = {
         .show  = dev_seq_show,
 };
 
-static int dev_seq_open(struct inode *inode, struct file *file)
-{
-        return seq_open_net(inode, file, &dev_seq_ops,
-                            sizeof(struct seq_net_private));
-}
-
-static const struct file_operations dev_seq_fops = {
-        .open    = dev_seq_open,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
-        .release = seq_release_net,
-};
-
 static const struct seq_operations softnet_seq_ops = {
         .start = softnet_seq_start,
         .next  = softnet_seq_next,
@@ -195,18 +182,6 @@ static const struct seq_operations softnet_seq_ops = {
         .show  = softnet_seq_show,
 };
 
-static int softnet_seq_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &softnet_seq_ops);
-}
-
-static const struct file_operations softnet_seq_fops = {
-        .open    = softnet_seq_open,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
-        .release = seq_release,
-};
-
 static void *ptype_get_idx(loff_t pos)
 {
         struct packet_type *pt = NULL;
@@ -297,30 +272,18 @@ static const struct seq_operations ptype_seq_ops = {
         .show  = ptype_seq_show,
 };
 
-static int ptype_seq_open(struct inode *inode, struct file *file)
-{
-        return seq_open_net(inode, file, &ptype_seq_ops,
-                        sizeof(struct seq_net_private));
-}
-
-static const struct file_operations ptype_seq_fops = {
-        .open    = ptype_seq_open,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
-        .release = seq_release_net,
-};
-
-
 static int __net_init dev_proc_net_init(struct net *net)
 {
         int rc = -ENOMEM;
 
-        if (!proc_create("dev", 0444, net->proc_net, &dev_seq_fops))
+        if (!proc_create_net("dev", 0444, net->proc_net, &dev_seq_ops,
+                        sizeof(struct seq_net_private)))
                 goto out;
-        if (!proc_create("softnet_stat", 0444, net->proc_net,
-                         &softnet_seq_fops))
+        if (!proc_create_seq("softnet_stat", 0444, net->proc_net,
+                         &softnet_seq_ops))
                 goto out_dev;
-        if (!proc_create("ptype", 0444, net->proc_net, &ptype_seq_fops))
+        if (!proc_create_net("ptype", 0444, net->proc_net, &ptype_seq_ops,
+                        sizeof(struct seq_net_private)))
                 goto out_softnet;
 
         if (wext_proc_init(net))
@@ -377,22 +340,10 @@ static const struct seq_operations dev_mc_seq_ops = {
         .show  = dev_mc_seq_show,
 };
 
-static int dev_mc_seq_open(struct inode *inode, struct file *file)
-{
-        return seq_open_net(inode, file, &dev_mc_seq_ops,
-                            sizeof(struct seq_net_private));
-}
-
-static const struct file_operations dev_mc_seq_fops = {
-        .open    = dev_mc_seq_open,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
-        .release = seq_release_net,
-};
-
 static int __net_init dev_mc_net_init(struct net *net)
 {
-        if (!proc_create("dev_mcast", 0, net->proc_net, &dev_mc_seq_fops))
+        if (!proc_create_net("dev_mcast", 0, net->proc_net, &dev_mc_seq_ops,
+                        sizeof(struct seq_net_private)))
                 return -ENOMEM;
         return 0;
 }
diff --git a/net/core/sock.c b/net/core/sock.c
index 3b6d02854e57..815770333d91 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -3439,22 +3439,10 @@ static const struct seq_operations proto_seq_ops = {
         .show   = proto_seq_show,
 };
 
-static int proto_seq_open(struct inode *inode, struct file *file)
-{
-        return seq_open_net(inode, file, &proto_seq_ops,
-                            sizeof(struct seq_net_private));
-}
-
-static const struct file_operations proto_seq_fops = {
-        .open           = proto_seq_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release_net,
-};
-
 static __net_init int proto_init_net(struct net *net)
 {
-        if (!proc_create("protocols", 0444, net->proc_net, &proto_seq_fops))
+        if (!proc_create_net("protocols", 0444, net->proc_net, &proto_seq_ops,
+                        sizeof(struct seq_net_private)))
                 return -ENOMEM;
 
         return 0;
diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c
index 32751602767f..7d6ff983ba2c 100644
--- a/net/decnet/af_decnet.c
+++ b/net/decnet/af_decnet.c
@@ -2314,19 +2314,6 @@ static const struct seq_operations dn_socket_seq_ops = {
         .stop   = dn_socket_seq_stop,
         .show   = dn_socket_seq_show,
 };
-
-static int dn_socket_seq_open(struct inode *inode, struct file *file)
-{
-        return seq_open_private(file, &dn_socket_seq_ops,
-                        sizeof(struct dn_iter_state));
-}
-
-static const struct file_operations dn_socket_seq_fops = {
-        .open           = dn_socket_seq_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release_private,
-};
 #endif
 
 static const struct net_proto_family    dn_family_ops = {
@@ -2383,7 +2370,9 @@ static int __init decnet_init(void)
         dev_add_pack(&dn_dix_packet_type);
         register_netdevice_notifier(&dn_dev_notifier);
 
-        proc_create("decnet", 0444, init_net.proc_net, &dn_socket_seq_fops);
+        proc_create_seq_private("decnet", 0444, init_net.proc_net,
+                        &dn_socket_seq_ops, sizeof(struct dn_iter_state),
+                        NULL);
         dn_register_sysctl();
 out:
         return rc;
diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c
index c03b046478c3..bfd43e8f2c06 100644
--- a/net/decnet/dn_dev.c
+++ b/net/decnet/dn_dev.c
@@ -1382,19 +1382,6 @@ static const struct seq_operations dn_dev_seq_ops = {
         .stop   = dn_dev_seq_stop,
         .show   = dn_dev_seq_show,
 };
-
-static int dn_dev_seq_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &dn_dev_seq_ops);
-}
-
-static const struct file_operations dn_dev_seq_fops = {
-        .open    = dn_dev_seq_open,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
-        .release = seq_release,
-};
-
 #endif /* CONFIG_PROC_FS */
 
 static int addr[2];
@@ -1424,7 +1411,7 @@ void __init dn_dev_init(void)
         rtnl_register_module(THIS_MODULE, PF_DECnet, RTM_GETADDR,
                              NULL, dn_nl_dump_ifaddr, 0);
 
-        proc_create("decnet_dev", 0444, init_net.proc_net, &dn_dev_seq_fops);
+        proc_create_seq("decnet_dev", 0444, init_net.proc_net, &dn_dev_seq_ops);
 
 #ifdef CONFIG_SYSCTL
         {
diff --git a/net/decnet/dn_neigh.c b/net/decnet/dn_neigh.c
index 13156165afa3..94b306f6d551 100644
--- a/net/decnet/dn_neigh.c
+++ b/net/decnet/dn_neigh.c
@@ -589,27 +589,13 @@ static const struct seq_operations dn_neigh_seq_ops = {
         .stop  = neigh_seq_stop,
         .show  = dn_neigh_seq_show,
 };
-
-static int dn_neigh_seq_open(struct inode *inode, struct file *file)
-{
-        return seq_open_net(inode, file, &dn_neigh_seq_ops,
-                            sizeof(struct neigh_seq_state));
-}
-
-static const struct file_operations dn_neigh_seq_fops = {
-        .open           = dn_neigh_seq_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release_net,
-};
-
 #endif
 
 void __init dn_neigh_init(void)
 {
         neigh_table_init(NEIGH_DN_TABLE, &dn_neigh_table);
-        proc_create("decnet_neigh", 0444, init_net.proc_net,
-                    &dn_neigh_seq_fops);
+        proc_create_net("decnet_neigh", 0444, init_net.proc_net,
+                        &dn_neigh_seq_ops, sizeof(struct neigh_seq_state));
 }
 
 void __exit dn_neigh_cleanup(void)
diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c
index eca0cc6b761f..e74765024d88 100644
--- a/net/decnet/dn_route.c
+++ b/net/decnet/dn_route.c
@@ -1852,20 +1852,6 @@ static const struct seq_operations dn_rt_cache_seq_ops = {
         .stop   = dn_rt_cache_seq_stop,
         .show   = dn_rt_cache_seq_show,
 };
-
-static int dn_rt_cache_seq_open(struct inode *inode, struct file *file)
-{
-        return seq_open_private(file, &dn_rt_cache_seq_ops,
-                        sizeof(struct dn_rt_cache_iter_state));
-}
-
-static const struct file_operations dn_rt_cache_seq_fops = {
-        .open    = dn_rt_cache_seq_open,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
-        .release = seq_release_private,
-};
-
 #endif /* CONFIG_PROC_FS */
 
 void __init dn_route_init(void)
@@ -1918,8 +1904,9 @@ void __init dn_route_init(void)
 
         dn_dst_ops.gc_thresh = (dn_rt_hash_mask + 1);
 
-        proc_create("decnet_cache", 0444, init_net.proc_net,
-                    &dn_rt_cache_seq_fops);
+        proc_create_seq_private("decnet_cache", 0444, init_net.proc_net,
+                        &dn_rt_cache_seq_ops,
+                        sizeof(struct dn_rt_cache_iter_state), NULL);
 
 #ifdef CONFIG_DECNET_ROUTER
         rtnl_register_module(THIS_MODULE, PF_DECnet, RTM_GETROUTE,
diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c
index bf6c2d4d4fdc..e90c89ef8c08 100644
--- a/net/ipv4/arp.c
+++ b/net/ipv4/arp.c
@@ -1418,23 +1418,12 @@ static const struct seq_operations arp_seq_ops = {
         .show   = arp_seq_show,
 };
 
-static int arp_seq_open(struct inode *inode, struct file *file)
-{
-        return seq_open_net(inode, file, &arp_seq_ops,
-                            sizeof(struct neigh_seq_state));
-}
-
-static const struct file_operations arp_seq_fops = {
-        .open           = arp_seq_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release_net,
-};
-
+/* ------------------------------------------------------------------------ */
 
 static int __net_init arp_net_init(struct net *net)
 {
-        if (!proc_create("arp", 0444, net->proc_net, &arp_seq_fops))
+        if (!proc_create_net("arp", 0444, net->proc_net, &arp_seq_ops,
+                        sizeof(struct neigh_seq_state)))
                 return -ENOMEM;
         return 0;
 }
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c
index 3dcffd3ce98c..99c23a0cb8ca 100644
--- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
@@ -2348,18 +2348,6 @@ static int fib_triestat_seq_show(struct seq_file *seq, void *v)
         return 0;
 }
 
-static int fib_triestat_seq_open(struct inode *inode, struct file *file)
-{
-        return single_open_net(inode, file, fib_triestat_seq_show);
-}
-
-static const struct file_operations fib_triestat_fops = {
-        .open   = fib_triestat_seq_open,
-        .read   = seq_read,
-        .llseek = seq_lseek,
-        .release = single_release_net,
-};
-
 static struct key_vector *fib_trie_get_idx(struct seq_file *seq, loff_t pos)
 {
         struct fib_trie_iter *iter = seq->private;
@@ -2533,19 +2521,6 @@ static const struct seq_operations fib_trie_seq_ops = {
         .show   = fib_trie_seq_show,
 };
 
-static int fib_trie_seq_open(struct inode *inode, struct file *file)
-{
-        return seq_open_net(inode, file, &fib_trie_seq_ops,
-                            sizeof(struct fib_trie_iter));
-}
-
-static const struct file_operations fib_trie_fops = {
-        .open   = fib_trie_seq_open,
-        .read   = seq_read,
-        .llseek = seq_lseek,
-        .release = seq_release_net,
-};
-
 struct fib_route_iter {
         struct seq_net_private p;
         struct fib_table *main_tb;
@@ -2726,29 +2701,18 @@ static const struct seq_operations fib_route_seq_ops = {
         .show   = fib_route_seq_show,
 };
 
-static int fib_route_seq_open(struct inode *inode, struct file *file)
-{
-        return seq_open_net(inode, file, &fib_route_seq_ops,
-                            sizeof(struct fib_route_iter));
-}
-
-static const struct file_operations fib_route_fops = {
-        .open   = fib_route_seq_open,
-        .read   = seq_read,
-        .llseek = seq_lseek,
-        .release = seq_release_net,
-};
-
 int __net_init fib_proc_init(struct net *net)
 {
-        if (!proc_create("fib_trie", 0444, net->proc_net, &fib_trie_fops))
+        if (!proc_create_net("fib_trie", 0444, net->proc_net, &fib_trie_seq_ops,
+                        sizeof(struct fib_trie_iter)))
                 goto out1;
 
-        if (!proc_create("fib_triestat", 0444, net->proc_net,
-                         &fib_triestat_fops))
+        if (!proc_create_net_single("fib_triestat", 0444, net->proc_net,
+                        fib_triestat_seq_show, NULL))
                 goto out2;
 
-        if (!proc_create("route", 0444, net->proc_net, &fib_route_fops))
+        if (!proc_create_net("route", 0444, net->proc_net, &fib_route_seq_ops,
+                        sizeof(struct fib_route_iter)))
                 goto out3;
 
         return 0;
diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c
index b26a81a7de42..85b617b655bc 100644
--- a/net/ipv4/igmp.c
+++ b/net/ipv4/igmp.c
@@ -2829,19 +2829,6 @@ static const struct seq_operations igmp_mc_seq_ops = {
         .show   =       igmp_mc_seq_show,
 };
 
-static int igmp_mc_seq_open(struct inode *inode, struct file *file)
-{
-        return seq_open_net(inode, file, &igmp_mc_seq_ops,
-                        sizeof(struct igmp_mc_iter_state));
-}
-
-static const struct file_operations igmp_mc_seq_fops = {
-        .open           =       igmp_mc_seq_open,
-        .read           =       seq_read,
-        .llseek         =       seq_lseek,
-        .release        =       seq_release_net,
-};
-
 struct igmp_mcf_iter_state {
         struct seq_net_private p;
         struct net_device *dev;
@@ -2975,29 +2962,17 @@ static const struct seq_operations igmp_mcf_seq_ops = {
         .show   =       igmp_mcf_seq_show,
 };
 
-static int igmp_mcf_seq_open(struct inode *inode, struct file *file)
-{
-        return seq_open_net(inode, file, &igmp_mcf_seq_ops,
-                        sizeof(struct igmp_mcf_iter_state));
-}
-
-static const struct file_operations igmp_mcf_seq_fops = {
-        .open           =       igmp_mcf_seq_open,
-        .read           =       seq_read,
-        .llseek         =       seq_lseek,
-        .release        =       seq_release_net,
-};
-
 static int __net_init igmp_net_init(struct net *net)
 {
         struct proc_dir_entry *pde;
         int err;
 
-        pde = proc_create("igmp", 0444, net->proc_net, &igmp_mc_seq_fops);
+        pde = proc_create_net("igmp", 0444, net->proc_net, &igmp_mc_seq_ops,
+                        sizeof(struct igmp_mc_iter_state));
         if (!pde)
                 goto out_igmp;
-        pde = proc_create("mcfilter", 0444, net->proc_net,
-                          &igmp_mcf_seq_fops);
+        pde = proc_create_net("mcfilter", 0444, net->proc_net,
+                        &igmp_mcf_seq_ops, sizeof(struct igmp_mcf_iter_state));
         if (!pde)
                 goto out_mcfilter;
         err = inet_ctl_sock_create(&net->ipv4.mc_autojoin_sk, AF_INET,
diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
index 43f620feb1c4..bbcbcc113d19 100644
--- a/net/ipv4/ipconfig.c
+++ b/net/ipv4/ipconfig.c
@@ -1282,18 +1282,6 @@ static int pnp_seq_show(struct seq_file *seq, void *v)
                            &ic_servaddr);
         return 0;
 }
-
-static int pnp_seq_open(struct inode *indoe, struct file *file)
-{
-        return single_open(file, pnp_seq_show, NULL);
-}
-
-static const struct file_operations pnp_seq_fops = {
-        .open           = pnp_seq_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
 #endif /* CONFIG_PROC_FS */
 
 /*
@@ -1369,7 +1357,7 @@ static int __init ip_auto_config(void)
         unsigned int i;
 
 #ifdef CONFIG_PROC_FS
-        proc_create("pnp", 0444, init_net.proc_net, &pnp_seq_fops);
+        proc_create_single("pnp", 0444, init_net.proc_net, pnp_seq_show);
 #endif /* CONFIG_PROC_FS */
 
         if (!ic_enable)
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
index 2fb4de3f7f66..37c4f885ff7b 100644
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@ -2828,19 +2828,6 @@ static const struct seq_operations ipmr_vif_seq_ops = {
         .show  = ipmr_vif_seq_show,
 };
 
-static int ipmr_vif_open(struct inode *inode, struct file *file)
-{
-        return seq_open_net(inode, file, &ipmr_vif_seq_ops,
-                            sizeof(struct mr_vif_iter));
-}
-
-static const struct file_operations ipmr_vif_fops = {
-        .open    = ipmr_vif_open,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
-        .release = seq_release_net,
-};
-
 static void *ipmr_mfc_seq_start(struct seq_file *seq, loff_t *pos)
 {
         struct net *net = seq_file_net(seq);
@@ -2900,19 +2887,6 @@ static const struct seq_operations ipmr_mfc_seq_ops = {
         .stop  = mr_mfc_seq_stop,
         .show  = ipmr_mfc_seq_show,
 };
-
-static int ipmr_mfc_open(struct inode *inode, struct file *file)
-{
-        return seq_open_net(inode, file, &ipmr_mfc_seq_ops,
-                            sizeof(struct mr_mfc_iter));
-}
-
-static const struct file_operations ipmr_mfc_fops = {
-        .open    = ipmr_mfc_open,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
-        .release = seq_release_net,
-};
 #endif
 
 #ifdef CONFIG_IP_PIMSM_V2
@@ -2977,9 +2951,11 @@ static int __net_init ipmr_net_init(struct net *net)
 
 #ifdef CONFIG_PROC_FS
         err = -ENOMEM;
-        if (!proc_create("ip_mr_vif", 0, net->proc_net, &ipmr_vif_fops))
+        if (!proc_create_net("ip_mr_vif", 0, net->proc_net, &ipmr_vif_seq_ops,
+                        sizeof(struct mr_vif_iter)))
                 goto proc_vif_fail;
-        if (!proc_create("ip_mr_cache", 0, net->proc_net, &ipmr_mfc_fops))
+        if (!proc_create_net("ip_mr_cache", 0, net->proc_net, &ipmr_mfc_seq_ops,
+                        sizeof(struct mr_mfc_iter)))
                 goto proc_cache_fail;
 #endif
         return 0;
diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
index 56a010622f70..2ed64bca54e3 100644
--- a/net/ipv4/ping.c
+++ b/net/ipv4/ping.c
@@ -1150,58 +1150,24 @@ static int ping_v4_seq_show(struct seq_file *seq, void *v)
         return 0;
 }
 
-static int ping_seq_open(struct inode *inode, struct file *file)
-{
-        struct ping_seq_afinfo *afinfo = PDE_DATA(inode);
-        return seq_open_net(inode, file, &afinfo->seq_ops,
-                           sizeof(struct ping_iter_state));
-}
-
-const struct file_operations ping_seq_fops = {
-        .open           = ping_seq_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release_net,
-};
-EXPORT_SYMBOL_GPL(ping_seq_fops);
-
-static struct ping_seq_afinfo ping_v4_seq_afinfo = {
-        .name           = "icmp",
-        .family         = AF_INET,
-        .seq_fops       = &ping_seq_fops,
-        .seq_ops        = {
-                .start          = ping_v4_seq_start,
-                .show           = ping_v4_seq_show,
-                .next           = ping_seq_next,
-                .stop           = ping_seq_stop,
-        },
+static const struct seq_operations ping_v4_seq_ops = {
+        .start          = ping_v4_seq_start,
+        .show           = ping_v4_seq_show,
+        .next           = ping_seq_next,
+        .stop           = ping_seq_stop,
 };
 
-int ping_proc_register(struct net *net, struct ping_seq_afinfo *afinfo)
+static int __net_init ping_v4_proc_init_net(struct net *net)
 {
-        struct proc_dir_entry *p;
-        p = proc_create_data(afinfo->name, 0444, net->proc_net,
-                             afinfo->seq_fops, afinfo);
-        if (!p)
+        if (!proc_create_net("icmp", 0444, net->proc_net, &ping_v4_seq_ops,
+                        sizeof(struct ping_iter_state)))
                 return -ENOMEM;
         return 0;
 }
-EXPORT_SYMBOL_GPL(ping_proc_register);
-
-void ping_proc_unregister(struct net *net, struct ping_seq_afinfo *afinfo)
-{
-        remove_proc_entry(afinfo->name, net->proc_net);
-}
-EXPORT_SYMBOL_GPL(ping_proc_unregister);
-
-static int __net_init ping_v4_proc_init_net(struct net *net)
-{
-        return ping_proc_register(net, &ping_v4_seq_afinfo);
-}
 
 static void __net_exit ping_v4_proc_exit_net(struct net *net)
 {
-        ping_proc_unregister(net, &ping_v4_seq_afinfo);
+        remove_proc_entry("icmp", net->proc_net);
 }
 
 static struct pernet_operations ping_v4_net_ops = {
diff --git a/net/ipv4/proc.c b/net/ipv4/proc.c
index a058de677e94..573e43c8ed87 100644
--- a/net/ipv4/proc.c
+++ b/net/ipv4/proc.c
@@ -77,18 +77,6 @@ static int sockstat_seq_show(struct seq_file *seq, void *v)
         return 0;
 }
 
-static int sockstat_seq_open(struct inode *inode, struct file *file)
-{
-        return single_open_net(inode, file, sockstat_seq_show);
-}
-
-static const struct file_operations sockstat_seq_fops = {
-        .open    = sockstat_seq_open,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
-        .release = single_release_net,
-};
-
 /* snmp items */
 static const struct snmp_mib snmp4_ipstats_list[] = {
         SNMP_MIB_ITEM("InReceives", IPSTATS_MIB_INPKTS),
@@ -460,20 +448,6 @@ static int snmp_seq_show(struct seq_file *seq, void *v)
         return 0;
 }
 
-static int snmp_seq_open(struct inode *inode, struct file *file)
-{
-        return single_open_net(inode, file, snmp_seq_show);
-}
-
-static const struct file_operations snmp_seq_fops = {
-        .open    = snmp_seq_open,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
-        .release = single_release_net,
-};
-
-
-
 /*
  *      Output /proc/net/netstat
  */
@@ -507,26 +481,16 @@ static int netstat_seq_show(struct seq_file *seq, void *v)
         return 0;
 }
 
-static int netstat_seq_open(struct inode *inode, struct file *file)
-{
-        return single_open_net(inode, file, netstat_seq_show);
-}
-
-static const struct file_operations netstat_seq_fops = {
-        .open    = netstat_seq_open,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
-        .release = single_release_net,
-};
-
 static __net_init int ip_proc_init_net(struct net *net)
 {
-        if (!proc_create("sockstat", 0444, net->proc_net,
-                         &sockstat_seq_fops))
+        if (!proc_create_net_single("sockstat", 0444, net->proc_net,
+                        sockstat_seq_show, NULL))
                 goto out_sockstat;
-        if (!proc_create("netstat", 0444, net->proc_net, &netstat_seq_fops))
+        if (!proc_create_net_single("netstat", 0444, net->proc_net,
+                        netstat_seq_show, NULL))
                 goto out_netstat;
-        if (!proc_create("snmp", 0444, net->proc_net, &snmp_seq_fops))
+        if (!proc_create_net_single("snmp", 0444, net->proc_net, snmp_seq_show,
+                        NULL))
                 goto out_snmp;
 
         return 0;
diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
index 1b4d3355624a..abb3c9490c55 100644
--- a/net/ipv4/raw.c
+++ b/net/ipv4/raw.c
@@ -1003,11 +1003,12 @@ struct proto raw_prot = {
 static struct sock *raw_get_first(struct seq_file *seq)
 {
         struct sock *sk;
+        struct raw_hashinfo *h = PDE_DATA(file_inode(seq->file));
         struct raw_iter_state *state = raw_seq_private(seq);
 
         for (state->bucket = 0; state->bucket < RAW_HTABLE_SIZE;
                         ++state->bucket) {
-                sk_for_each(sk, &state->h->ht[state->bucket])
+                sk_for_each(sk, &h->ht[state->bucket])
                         if (sock_net(sk) == seq_file_net(seq))
                                 goto found;
         }
@@ -1018,6 +1019,7 @@ found:
 
 static struct sock *raw_get_next(struct seq_file *seq, struct sock *sk)
 {
+        struct raw_hashinfo *h = PDE_DATA(file_inode(seq->file));
         struct raw_iter_state *state = raw_seq_private(seq);
 
         do {
@@ -1027,7 +1029,7 @@ try_again:
         } while (sk && sock_net(sk) != seq_file_net(seq));
 
         if (!sk && ++state->bucket < RAW_HTABLE_SIZE) {
-                sk = sk_head(&state->h->ht[state->bucket]);
+                sk = sk_head(&h->ht[state->bucket]);
                 goto try_again;
         }
         return sk;
@@ -1045,9 +1047,9 @@ static struct sock *raw_get_idx(struct seq_file *seq, loff_t pos)
 
 void *raw_seq_start(struct seq_file *seq, loff_t *pos)
 {
-        struct raw_iter_state *state = raw_seq_private(seq);
+        struct raw_hashinfo *h = PDE_DATA(file_inode(seq->file));
 
-        read_lock(&state->h->lock);
+        read_lock(&h->lock);
         return *pos ? raw_get_idx(seq, *pos - 1) : SEQ_START_TOKEN;
 }
 EXPORT_SYMBOL_GPL(raw_seq_start);
@@ -1067,9 +1069,9 @@ EXPORT_SYMBOL_GPL(raw_seq_next);
 
 void raw_seq_stop(struct seq_file *seq, void *v)
 {
-        struct raw_iter_state *state = raw_seq_private(seq);
+        struct raw_hashinfo *h = PDE_DATA(file_inode(seq->file));
 
-        read_unlock(&state->h->lock);
+        read_unlock(&h->lock);
 }
 EXPORT_SYMBOL_GPL(raw_seq_stop);
 
@@ -1110,37 +1112,10 @@ static const struct seq_operations raw_seq_ops = {
         .show  = raw_seq_show,
 };
 
-int raw_seq_open(struct inode *ino, struct file *file,
-                 struct raw_hashinfo *h, const struct seq_operations *ops)
-{
-        int err;
-        struct raw_iter_state *i;
-
-        err = seq_open_net(ino, file, ops, sizeof(struct raw_iter_state));
-        if (err < 0)
-                return err;
-
-        i = raw_seq_private((struct seq_file *)file->private_data);
-        i->h = h;
-        return 0;
-}
-EXPORT_SYMBOL_GPL(raw_seq_open);
-
-static int raw_v4_seq_open(struct inode *inode, struct file *file)
-{
-        return raw_seq_open(inode, file, &raw_v4_hashinfo, &raw_seq_ops);
-}
-
-static const struct file_operations raw_seq_fops = {
-        .open    = raw_v4_seq_open,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
-        .release = seq_release_net,
-};
-
 static __net_init int raw_init_net(struct net *net)
 {
-        if (!proc_create("raw", 0444, net->proc_net, &raw_seq_fops))
+        if (!proc_create_net_data("raw", 0444, net->proc_net, &raw_seq_ops,
+                        sizeof(struct raw_iter_state), &raw_v4_hashinfo))
                 return -ENOMEM;
 
         return 0;
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 2cfa1b518f8d..75fb8864be67 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -360,18 +360,6 @@ static int rt_acct_proc_show(struct seq_file *m, void *v)
         kfree(dst);
         return 0;
 }
-
-static int rt_acct_proc_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, rt_acct_proc_show, NULL);
-}
-
-static const struct file_operations rt_acct_proc_fops = {
-        .open           = rt_acct_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
 #endif
 
 static int __net_init ip_rt_do_proc_init(struct net *net)
@@ -389,7 +377,8 @@ static int __net_init ip_rt_do_proc_init(struct net *net)
                 goto err2;
 
 #ifdef CONFIG_IP_ROUTE_CLASSID
-        pde = proc_create("rt_acct", 0, net->proc_net, &rt_acct_proc_fops);
+        pde = proc_create_single("rt_acct", 0, net->proc_net,
+                        rt_acct_proc_show);
         if (!pde)
                 goto err3;
 #endif
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index f70586b50838..2c970626b398 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -1961,6 +1961,7 @@ EXPORT_SYMBOL(tcp_v4_destroy_sock);
  */
 static void *listening_get_next(struct seq_file *seq, void *cur)
 {
+        struct tcp_seq_afinfo *afinfo = PDE_DATA(file_inode(seq->file));
         struct tcp_iter_state *st = seq->private;
         struct net *net = seq_file_net(seq);
         struct inet_listen_hashbucket *ilb;
@@ -1983,7 +1984,7 @@ get_sk:
         sk_for_each_from(sk) {
                 if (!net_eq(sock_net(sk), net))
                         continue;
-                if (sk->sk_family == st->family)
+                if (sk->sk_family == afinfo->family)
                         return sk;
         }
         spin_unlock(&ilb->lock);
@@ -2020,6 +2021,7 @@ static inline bool empty_bucket(const struct tcp_iter_state *st)
  */
 static void *established_get_first(struct seq_file *seq)
 {
+        struct tcp_seq_afinfo *afinfo = PDE_DATA(file_inode(seq->file));
         struct tcp_iter_state *st = seq->private;
         struct net *net = seq_file_net(seq);
         void *rc = NULL;
@@ -2036,7 +2038,7 @@ static void *established_get_first(struct seq_file *seq)
 
                 spin_lock_bh(lock);
                 sk_nulls_for_each(sk, node, &tcp_hashinfo.ehash[st->bucket].chain) {
-                        if (sk->sk_family != st->family ||
+                        if (sk->sk_family != afinfo->family ||
                             !net_eq(sock_net(sk), net)) {
                                 continue;
                         }
@@ -2051,6 +2053,7 @@ out:
 
 static void *established_get_next(struct seq_file *seq, void *cur)
 {
+        struct tcp_seq_afinfo *afinfo = PDE_DATA(file_inode(seq->file));
         struct sock *sk = cur;
         struct hlist_nulls_node *node;
         struct tcp_iter_state *st = seq->private;
@@ -2062,7 +2065,8 @@ static void *established_get_next(struct seq_file *seq, void *cur)
         sk = sk_nulls_next(sk);
 
         sk_nulls_for_each_from(sk, node) {
-                if (sk->sk_family == st->family && net_eq(sock_net(sk), net))
+                if (sk->sk_family == afinfo->family &&
+                    net_eq(sock_net(sk), net))
                         return sk;
         }
 
@@ -2135,7 +2139,7 @@ static void *tcp_seek_last_pos(struct seq_file *seq)
         return rc;
 }
 
-static void *tcp_seq_start(struct seq_file *seq, loff_t *pos)
+void *tcp_seq_start(struct seq_file *seq, loff_t *pos)
 {
         struct tcp_iter_state *st = seq->private;
         void *rc;
@@ -2156,8 +2160,9 @@ out:
         st->last_pos = *pos;
         return rc;
 }
+EXPORT_SYMBOL(tcp_seq_start);
 
-static void *tcp_seq_next(struct seq_file *seq, void *v, loff_t *pos)
+void *tcp_seq_next(struct seq_file *seq, void *v, loff_t *pos)
 {
         struct tcp_iter_state *st = seq->private;
         void *rc = NULL;
@@ -2186,8 +2191,9 @@ out:
         st->last_pos = *pos;
         return rc;
 }
+EXPORT_SYMBOL(tcp_seq_next);
 
-static void tcp_seq_stop(struct seq_file *seq, void *v)
+void tcp_seq_stop(struct seq_file *seq, void *v)
 {
         struct tcp_iter_state *st = seq->private;
 
@@ -2202,47 +2208,7 @@ static void tcp_seq_stop(struct seq_file *seq, void *v)
                 break;
         }
 }
-
-int tcp_seq_open(struct inode *inode, struct file *file)
-{
-        struct tcp_seq_afinfo *afinfo = PDE_DATA(inode);
-        struct tcp_iter_state *s;
-        int err;
-
-        err = seq_open_net(inode, file, &afinfo->seq_ops,
-                          sizeof(struct tcp_iter_state));
-        if (err < 0)
-                return err;
-
-        s = ((struct seq_file *)file->private_data)->private;
-        s->family               = afinfo->family;
-        s->last_pos             = 0;
-        return 0;
-}
-EXPORT_SYMBOL(tcp_seq_open);
-
-int tcp_proc_register(struct net *net, struct tcp_seq_afinfo *afinfo)
-{
-        int rc = 0;
-        struct proc_dir_entry *p;
-
-        afinfo->seq_ops.start           = tcp_seq_start;
-        afinfo->seq_ops.next            = tcp_seq_next;
-        afinfo->seq_ops.stop            = tcp_seq_stop;
-
-        p = proc_create_data(afinfo->name, 0444, net->proc_net,
-                             afinfo->seq_fops, afinfo);
-        if (!p)
-                rc = -ENOMEM;
-        return rc;
-}
-EXPORT_SYMBOL(tcp_proc_register);
-
-void tcp_proc_unregister(struct net *net, struct tcp_seq_afinfo *afinfo)
-{
-        remove_proc_entry(afinfo->name, net->proc_net);
-}
-EXPORT_SYMBOL(tcp_proc_unregister);
+EXPORT_SYMBOL(tcp_seq_stop);
 
 static void get_openreq4(const struct request_sock *req,
                          struct seq_file *f, int i)
@@ -2377,30 +2343,28 @@ out:
         return 0;
 }
 
-static const struct file_operations tcp_afinfo_seq_fops = {
-        .open    = tcp_seq_open,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
-        .release = seq_release_net
+static const struct seq_operations tcp4_seq_ops = {
+        .show           = tcp4_seq_show,
+        .start          = tcp_seq_start,
+        .next           = tcp_seq_next,
+        .stop           = tcp_seq_stop,
 };
 
 static struct tcp_seq_afinfo tcp4_seq_afinfo = {
-        .name           = "tcp",
         .family         = AF_INET,
-        .seq_fops       = &tcp_afinfo_seq_fops,
-        .seq_ops        = {
-                .show           = tcp4_seq_show,
-        },
 };
 
 static int __net_init tcp4_proc_init_net(struct net *net)
 {
-        return tcp_proc_register(net, &tcp4_seq_afinfo);
+        if (!proc_create_net_data("tcp", 0444, net->proc_net, &tcp4_seq_ops,
+                        sizeof(struct tcp_iter_state), &tcp4_seq_afinfo))
+                return -ENOMEM;
+        return 0;
 }
 
 static void __net_exit tcp4_proc_exit_net(struct net *net)
 {
-        tcp_proc_unregister(net, &tcp4_seq_afinfo);
+        remove_proc_entry("tcp", net->proc_net);
 }
 
 static struct pernet_operations tcp4_net_ops = {
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index b61a770884fa..051a43ff3fb8 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -2582,12 +2582,13 @@ EXPORT_SYMBOL(udp_prot);
 static struct sock *udp_get_first(struct seq_file *seq, int start)
 {
         struct sock *sk;
+        struct udp_seq_afinfo *afinfo = PDE_DATA(file_inode(seq->file));
         struct udp_iter_state *state = seq->private;
         struct net *net = seq_file_net(seq);
 
-        for (state->bucket = start; state->bucket <= state->udp_table->mask;
+        for (state->bucket = start; state->bucket <= afinfo->udp_table->mask;
              ++state->bucket) {
-                struct udp_hslot *hslot = &state->udp_table->hash[state->bucket];
+                struct udp_hslot *hslot = &afinfo->udp_table->hash[state->bucket];
 
                 if (hlist_empty(&hslot->head))
                         continue;
@@ -2596,7 +2597,7 @@ static struct sock *udp_get_first(struct seq_file *seq, int start)
                 sk_for_each(sk, &hslot->head) {
                         if (!net_eq(sock_net(sk), net))
                                 continue;
-                        if (sk->sk_family == state->family)
+                        if (sk->sk_family == afinfo->family)
                                 goto found;
                 }
                 spin_unlock_bh(&hslot->lock);
@@ -2608,16 +2609,17 @@ found:
 
 static struct sock *udp_get_next(struct seq_file *seq, struct sock *sk)
 {
+        struct udp_seq_afinfo *afinfo = PDE_DATA(file_inode(seq->file));
         struct udp_iter_state *state = seq->private;
         struct net *net = seq_file_net(seq);
 
         do {
                 sk = sk_next(sk);
-        } while (sk && (!net_eq(sock_net(sk), net) || sk->sk_family != state->family));
+        } while (sk && (!net_eq(sock_net(sk), net) || sk->sk_family != afinfo->family));
 
         if (!sk) {
-                if (state->bucket <= state->udp_table->mask)
-                        spin_unlock_bh(&state->udp_table->hash[state->bucket].lock);
+                if (state->bucket <= afinfo->udp_table->mask)
+                        spin_unlock_bh(&afinfo->udp_table->hash[state->bucket].lock);
                 return udp_get_first(seq, state->bucket + 1);
         }
         return sk;
@@ -2633,15 +2635,16 @@ static struct sock *udp_get_idx(struct seq_file *seq, loff_t pos)
         return pos ? NULL : sk;
 }
 
-static void *udp_seq_start(struct seq_file *seq, loff_t *pos)
+void *udp_seq_start(struct seq_file *seq, loff_t *pos)
 {
         struct udp_iter_state *state = seq->private;
         state->bucket = MAX_UDP_PORTS;
 
         return *pos ? udp_get_idx(seq, *pos-1) : SEQ_START_TOKEN;
 }
+EXPORT_SYMBOL(udp_seq_start);
 
-static void *udp_seq_next(struct seq_file *seq, void *v, loff_t *pos)
+void *udp_seq_next(struct seq_file *seq, void *v, loff_t *pos)
 {
         struct sock *sk;
 
@@ -2653,56 +2656,17 @@ static void *udp_seq_next(struct seq_file *seq, void *v, loff_t *pos)
         ++*pos;
         return sk;
 }
+EXPORT_SYMBOL(udp_seq_next);
 
-static void udp_seq_stop(struct seq_file *seq, void *v)
+void udp_seq_stop(struct seq_file *seq, void *v)
 {
+        struct udp_seq_afinfo *afinfo = PDE_DATA(file_inode(seq->file));
         struct udp_iter_state *state = seq->private;
 
-        if (state->bucket <= state->udp_table->mask)
-                spin_unlock_bh(&state->udp_table->hash[state->bucket].lock);
+        if (state->bucket <= afinfo->udp_table->mask)
+                spin_unlock_bh(&afinfo->udp_table->hash[state->bucket].lock);
 }
-
-int udp_seq_open(struct inode *inode, struct file *file)
-{
-        struct udp_seq_afinfo *afinfo = PDE_DATA(inode);
-        struct udp_iter_state *s;
-        int err;
-
-        err = seq_open_net(inode, file, &afinfo->seq_ops,
-                           sizeof(struct udp_iter_state));
-        if (err < 0)
-                return err;
-
-        s = ((struct seq_file *)file->private_data)->private;
-        s->family               = afinfo->family;
-        s->udp_table            = afinfo->udp_table;
-        return err;
-}
-EXPORT_SYMBOL(udp_seq_open);
-
-/* ------------------------------------------------------------------------ */
-int udp_proc_register(struct net *net, struct udp_seq_afinfo *afinfo)
-{
-        struct proc_dir_entry *p;
-        int rc = 0;
-
-        afinfo->seq_ops.start           = udp_seq_start;
-        afinfo->seq_ops.next            = udp_seq_next;
-        afinfo->seq_ops.stop            = udp_seq_stop;
-
-        p = proc_create_data(afinfo->name, 0444, net->proc_net,
-                             afinfo->seq_fops, afinfo);
-        if (!p)
-                rc = -ENOMEM;
-        return rc;
-}
-EXPORT_SYMBOL(udp_proc_register);
-
-void udp_proc_unregister(struct net *net, struct udp_seq_afinfo *afinfo)
-{
-        remove_proc_entry(afinfo->name, net->proc_net);
-}
-EXPORT_SYMBOL(udp_proc_unregister);
+EXPORT_SYMBOL(udp_seq_stop);
 
 /* ------------------------------------------------------------------------ */
 static void udp4_format_sock(struct sock *sp, struct seq_file *f,
@@ -2742,32 +2706,30 @@ int udp4_seq_show(struct seq_file *seq, void *v)
         return 0;
 }
 
-static const struct file_operations udp_afinfo_seq_fops = {
-        .open     = udp_seq_open,
-        .read     = seq_read,
-        .llseek   = seq_lseek,
-        .release  = seq_release_net
+const struct seq_operations udp_seq_ops = {
+        .start          = udp_seq_start,
+        .next           = udp_seq_next,
+        .stop           = udp_seq_stop,
+        .show           = udp4_seq_show,
 };
+EXPORT_SYMBOL(udp_seq_ops);
 
-/* ------------------------------------------------------------------------ */
 static struct udp_seq_afinfo udp4_seq_afinfo = {
-        .name           = "udp",
         .family         = AF_INET,
         .udp_table      = &udp_table,
-        .seq_fops       = &udp_afinfo_seq_fops,
-        .seq_ops        = {
-                .show           = udp4_seq_show,
-        },
 };
 
 static int __net_init udp4_proc_init_net(struct net *net)
 {
-        return udp_proc_register(net, &udp4_seq_afinfo);
+        if (!proc_create_net_data("udp", 0444, net->proc_net, &udp_seq_ops,
+                        sizeof(struct udp_iter_state), &udp4_seq_afinfo))
+                return -ENOMEM;
+        return 0;
 }
 
 static void __net_exit udp4_proc_exit_net(struct net *net)
 {
-        udp_proc_unregister(net, &udp4_seq_afinfo);
+        remove_proc_entry("udp", net->proc_net);
 }
 
 static struct pernet_operations udp4_net_ops = {
diff --git a/net/ipv4/udplite.c b/net/ipv4/udplite.c
index f96614e9b9a5..8545457752fb 100644
--- a/net/ipv4/udplite.c
+++ b/net/ipv4/udplite.c
@@ -14,6 +14,7 @@
 #define pr_fmt(fmt) "UDPLite: " fmt
 
 #include <linux/export.h>
+#include <linux/proc_fs.h>
 #include "udp_impl.h"
 
 struct udp_table        udplite_table __read_mostly;
@@ -73,32 +74,22 @@ static struct inet_protosw udplite4_protosw = {
 };
 
 #ifdef CONFIG_PROC_FS
-
-static const struct file_operations udplite_afinfo_seq_fops = {
-        .open     = udp_seq_open,
-        .read     = seq_read,
-        .llseek   = seq_lseek,
-        .release  = seq_release_net
-};
-
 static struct udp_seq_afinfo udplite4_seq_afinfo = {
-        .name           = "udplite",
         .family         = AF_INET,
         .udp_table      = &udplite_table,
-        .seq_fops       = &udplite_afinfo_seq_fops,
-        .seq_ops        = {
-                .show           = udp4_seq_show,
-        },
 };
 
 static int __net_init udplite4_proc_init_net(struct net *net)
 {
-        return udp_proc_register(net, &udplite4_seq_afinfo);
+        if (!proc_create_net_data("udplite", 0444, net->proc_net, &udp_seq_ops,
+                        sizeof(struct udp_iter_state), &udplite4_seq_afinfo))
+                return -ENOMEM;
+        return 0;
 }
 
 static void __net_exit udplite4_proc_exit_net(struct net *net)
 {
-        udp_proc_unregister(net, &udplite4_seq_afinfo);
+        remove_proc_entry("udplite", net->proc_net);
 }
 
 static struct pernet_operations udplite4_net_ops = {
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 78cef00c9596..1b5ea3379d9b 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -4254,22 +4254,10 @@ static const struct seq_operations if6_seq_ops = {
         .stop   = if6_seq_stop,
 };
 
-static int if6_seq_open(struct inode *inode, struct file *file)
-{
-        return seq_open_net(inode, file, &if6_seq_ops,
-                            sizeof(struct if6_iter_state));
-}
-
-static const struct file_operations if6_fops = {
-        .open           = if6_seq_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release_net,
-};
-
 static int __net_init if6_proc_net_init(struct net *net)
 {
-        if (!proc_create("if_inet6", 0444, net->proc_net, &if6_fops))
+        if (!proc_create_net("if_inet6", 0444, net->proc_net, &if6_seq_ops,
+                        sizeof(struct if6_iter_state)))
                 return -ENOMEM;
         return 0;
 }
diff --git a/net/ipv6/anycast.c b/net/ipv6/anycast.c
index bbcabbba9bd8..ebeaf47d5c8d 100644
--- a/net/ipv6/anycast.c
+++ b/net/ipv6/anycast.c
@@ -529,22 +529,10 @@ static const struct seq_operations ac6_seq_ops = {
         .show   =       ac6_seq_show,
 };
 
-static int ac6_seq_open(struct inode *inode, struct file *file)
-{
-        return seq_open_net(inode, file, &ac6_seq_ops,
-                            sizeof(struct ac6_iter_state));
-}
-
-static const struct file_operations ac6_seq_fops = {
-        .open           =       ac6_seq_open,
-        .read           =       seq_read,
-        .llseek         =       seq_lseek,
-        .release        =       seq_release_net,
-};
-
 int __net_init ac6_proc_init(struct net *net)
 {
-        if (!proc_create("anycast6", 0444, net->proc_net, &ac6_seq_fops))
+        if (!proc_create_net("anycast6", 0444, net->proc_net, &ac6_seq_ops,
+                        sizeof(struct ac6_iter_state)))
                 return -ENOMEM;
 
         return 0;
diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
index deab2db6692e..01372dd74e38 100644
--- a/net/ipv6/ip6_fib.c
+++ b/net/ipv6/ip6_fib.c
@@ -2209,15 +2209,6 @@ void fib6_gc_cleanup(void)
 }
 
 #ifdef CONFIG_PROC_FS
-
-struct ipv6_route_iter {
-        struct seq_net_private p;
-        struct fib6_walker w;
-        loff_t skip;
-        struct fib6_table *tbl;
-        int sernum;
-};
-
 static int ipv6_route_seq_show(struct seq_file *seq, void *v)
 {
         struct rt6_info *rt = v;
@@ -2383,17 +2374,10 @@ static void ipv6_route_seq_stop(struct seq_file *seq, void *v)
         rcu_read_unlock_bh();
 }
 
-static const struct seq_operations ipv6_route_seq_ops = {
+const struct seq_operations ipv6_route_seq_ops = {
         .start  = ipv6_route_seq_start,
         .next   = ipv6_route_seq_next,
         .stop   = ipv6_route_seq_stop,
         .show   = ipv6_route_seq_show
 };
-
-int ipv6_route_open(struct inode *inode, struct file *file)
-{
-        return seq_open_net(inode, file, &ipv6_route_seq_ops,
-                            sizeof(struct ipv6_route_iter));
-}
-
 #endif /* CONFIG_PROC_FS */
diff --git a/net/ipv6/ip6_flowlabel.c b/net/ipv6/ip6_flowlabel.c
index c05c4e82a7ca..3eee7637bdfe 100644
--- a/net/ipv6/ip6_flowlabel.c
+++ b/net/ipv6/ip6_flowlabel.c
@@ -754,6 +754,10 @@ static struct ip6_flowlabel *ip6fl_get_idx(struct seq_file *seq, loff_t pos)
 static void *ip6fl_seq_start(struct seq_file *seq, loff_t *pos)
         __acquires(RCU)
 {
+        struct ip6fl_iter_state *state = ip6fl_seq_private(seq);
+
+        state->pid_ns = proc_pid_ns(file_inode(seq->file));
+
         rcu_read_lock_bh();
         return *pos ? ip6fl_get_idx(seq, *pos - 1) : SEQ_START_TOKEN;
 }
@@ -808,44 +812,10 @@ static const struct seq_operations ip6fl_seq_ops = {
         .show   =       ip6fl_seq_show,
 };
 
-static int ip6fl_seq_open(struct inode *inode, struct file *file)
-{
-        struct seq_file *seq;
-        struct ip6fl_iter_state *state;
-        int err;
-
-        err = seq_open_net(inode, file, &ip6fl_seq_ops,
-                           sizeof(struct ip6fl_iter_state));
-
-        if (!err) {
-                seq = file->private_data;
-                state = ip6fl_seq_private(seq);
-                rcu_read_lock();
-                state->pid_ns = get_pid_ns(task_active_pid_ns(current));
-                rcu_read_unlock();
-        }
-        return err;
-}
-
-static int ip6fl_seq_release(struct inode *inode, struct file *file)
-{
-        struct seq_file *seq = file->private_data;
-        struct ip6fl_iter_state *state = ip6fl_seq_private(seq);
-        put_pid_ns(state->pid_ns);
-        return seq_release_net(inode, file);
-}
-
-static const struct file_operations ip6fl_seq_fops = {
-        .open           =       ip6fl_seq_open,
-        .read           =       seq_read,
-        .llseek         =       seq_lseek,
-        .release        =       ip6fl_seq_release,
-};
-
 static int __net_init ip6_flowlabel_proc_init(struct net *net)
 {
-        if (!proc_create("ip6_flowlabel", 0444, net->proc_net,
-                         &ip6fl_seq_fops))
+        if (!proc_create_net("ip6_flowlabel", 0444, net->proc_net,
+                        &ip6fl_seq_ops, sizeof(struct ip6fl_iter_state)))
                 return -ENOMEM;
         return 0;
 }
diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c
index 298fd8b6ed17..4a15529d33eb 100644
--- a/net/ipv6/ip6mr.c
+++ b/net/ipv6/ip6mr.c
@@ -439,19 +439,6 @@ static const struct seq_operations ip6mr_vif_seq_ops = {
         .show  = ip6mr_vif_seq_show,
 };
 
-static int ip6mr_vif_open(struct inode *inode, struct file *file)
-{
-        return seq_open_net(inode, file, &ip6mr_vif_seq_ops,
-                            sizeof(struct mr_vif_iter));
-}
-
-static const struct file_operations ip6mr_vif_fops = {
-        .open    = ip6mr_vif_open,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
-        .release = seq_release_net,
-};
-
 static void *ipmr_mfc_seq_start(struct seq_file *seq, loff_t *pos)
 {
         struct net *net = seq_file_net(seq);
@@ -512,19 +499,6 @@ static const struct seq_operations ipmr_mfc_seq_ops = {
         .stop  = mr_mfc_seq_stop,
         .show  = ipmr_mfc_seq_show,
 };
-
-static int ipmr_mfc_open(struct inode *inode, struct file *file)
-{
-        return seq_open_net(inode, file, &ipmr_mfc_seq_ops,
-                            sizeof(struct mr_mfc_iter));
-}
-
-static const struct file_operations ip6mr_mfc_fops = {
-        .open    = ipmr_mfc_open,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
-        .release = seq_release_net,
-};
 #endif
 
 #ifdef CONFIG_IPV6_PIMSM_V2
@@ -1316,9 +1290,11 @@ static int __net_init ip6mr_net_init(struct net *net)
 
 #ifdef CONFIG_PROC_FS
         err = -ENOMEM;
-        if (!proc_create("ip6_mr_vif", 0, net->proc_net, &ip6mr_vif_fops))
+        if (!proc_create_net("ip6_mr_vif", 0, net->proc_net, &ip6mr_vif_seq_ops,
+                        sizeof(struct mr_vif_iter)))
                 goto proc_vif_fail;
-        if (!proc_create("ip6_mr_cache", 0, net->proc_net, &ip6mr_mfc_fops))
+        if (!proc_create_net("ip6_mr_cache", 0, net->proc_net, &ipmr_mfc_seq_ops,
+                        sizeof(struct mr_mfc_iter)))
                 goto proc_cache_fail;
 #endif
 
diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c
index 793159d77d8a..975021df7c1c 100644
--- a/net/ipv6/mcast.c
+++ b/net/ipv6/mcast.c
@@ -2749,19 +2749,6 @@ static const struct seq_operations igmp6_mc_seq_ops = {
         .show   =       igmp6_mc_seq_show,
 };
 
-static int igmp6_mc_seq_open(struct inode *inode, struct file *file)
-{
-        return seq_open_net(inode, file, &igmp6_mc_seq_ops,
-                            sizeof(struct igmp6_mc_iter_state));
-}
-
-static const struct file_operations igmp6_mc_seq_fops = {
-        .open           =       igmp6_mc_seq_open,
-        .read           =       seq_read,
-        .llseek         =       seq_lseek,
-        .release        =       seq_release_net,
-};
-
 struct igmp6_mcf_iter_state {
         struct seq_net_private p;
         struct net_device *dev;
@@ -2903,28 +2890,17 @@ static const struct seq_operations igmp6_mcf_seq_ops = {
         .show   =       igmp6_mcf_seq_show,
 };
 
-static int igmp6_mcf_seq_open(struct inode *inode, struct file *file)
-{
-        return seq_open_net(inode, file, &igmp6_mcf_seq_ops,
-                            sizeof(struct igmp6_mcf_iter_state));
-}
-
-static const struct file_operations igmp6_mcf_seq_fops = {
-        .open           =       igmp6_mcf_seq_open,
-        .read           =       seq_read,
-        .llseek         =       seq_lseek,
-        .release        =       seq_release_net,
-};
-
 static int __net_init igmp6_proc_init(struct net *net)
 {
         int err;
 
         err = -ENOMEM;
-        if (!proc_create("igmp6", 0444, net->proc_net, &igmp6_mc_seq_fops))
+        if (!proc_create_net("igmp6", 0444, net->proc_net, &igmp6_mc_seq_ops,
+                        sizeof(struct igmp6_mc_iter_state)))
                 goto out;
-        if (!proc_create("mcfilter6", 0444, net->proc_net,
-                         &igmp6_mcf_seq_fops))
+        if (!proc_create_net("mcfilter6", 0444, net->proc_net,
+                        &igmp6_mcf_seq_ops,
+                        sizeof(struct igmp6_mcf_iter_state)))
                 goto out_proc_net_igmp6;
 
         err = 0;
diff --git a/net/ipv6/ping.c b/net/ipv6/ping.c
index 746eeae7f581..96f56bf49a30 100644
--- a/net/ipv6/ping.c
+++ b/net/ipv6/ping.c
@@ -24,6 +24,7 @@
 #include <net/protocol.h>
 #include <net/udp.h>
 #include <net/transp_v6.h>
+#include <linux/proc_fs.h>
 #include <net/ping.h>
 
 /* Compatibility glue so we can support IPv6 when it's compiled as a module */
@@ -215,26 +216,24 @@ static int ping_v6_seq_show(struct seq_file *seq, void *v)
         return 0;
 }
 
-static struct ping_seq_afinfo ping_v6_seq_afinfo = {
-        .name           = "icmp6",
-        .family         = AF_INET6,
-        .seq_fops       = &ping_seq_fops,
-        .seq_ops        = {
-                .start          = ping_v6_seq_start,
-                .show           = ping_v6_seq_show,
-                .next           = ping_seq_next,
-                .stop           = ping_seq_stop,
-        },
+static const struct seq_operations ping_v6_seq_ops = {
+        .start          = ping_v6_seq_start,
+        .show           = ping_v6_seq_show,
+        .next           = ping_seq_next,
+        .stop           = ping_seq_stop,
 };
 
 static int __net_init ping_v6_proc_init_net(struct net *net)
 {
-        return ping_proc_register(net, &ping_v6_seq_afinfo);
+        if (!proc_create_net("icmp6", 0444, net->proc_net, &ping_v6_seq_ops,
+                        sizeof(struct ping_iter_state)))
+                return -ENOMEM;
+        return 0;
 }
 
 static void __net_init ping_v6_proc_exit_net(struct net *net)
 {
-        return ping_proc_unregister(net, &ping_v6_seq_afinfo);
+        remove_proc_entry("icmp6", net->proc_net);
 }
 
 static struct pernet_operations ping_v6_net_ops = {
diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c
index a85f7e0b14b1..2356b4af7309 100644
--- a/net/ipv6/proc.c
+++ b/net/ipv6/proc.c
@@ -53,18 +53,6 @@ static int sockstat6_seq_show(struct seq_file *seq, void *v)
         return 0;
 }
 
-static int sockstat6_seq_open(struct inode *inode, struct file *file)
-{
-        return single_open_net(inode, file, sockstat6_seq_show);
-}
-
-static const struct file_operations sockstat6_seq_fops = {
-        .open    = sockstat6_seq_open,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
-        .release = single_release_net,
-};
-
 static const struct snmp_mib snmp6_ipstats_list[] = {
 /* ipv6 mib according to RFC 2465 */
         SNMP_MIB_ITEM("Ip6InReceives", IPSTATS_MIB_INPKTS),
@@ -242,18 +230,6 @@ static int snmp6_seq_show(struct seq_file *seq, void *v)
         return 0;
 }
 
-static int snmp6_seq_open(struct inode *inode, struct file *file)
-{
-        return single_open_net(inode, file, snmp6_seq_show);
-}
-
-static const struct file_operations snmp6_seq_fops = {
-        .open    = snmp6_seq_open,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
-        .release = single_release_net,
-};
-
 static int snmp6_dev_seq_show(struct seq_file *seq, void *v)
 {
         struct inet6_dev *idev = (struct inet6_dev *)seq->private;
@@ -267,18 +243,6 @@ static int snmp6_dev_seq_show(struct seq_file *seq, void *v)
         return 0;
 }
 
-static int snmp6_dev_seq_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, snmp6_dev_seq_show, PDE_DATA(inode));
-}
-
-static const struct file_operations snmp6_dev_seq_fops = {
-        .open    = snmp6_dev_seq_open,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
-        .release = single_release,
-};
-
 int snmp6_register_dev(struct inet6_dev *idev)
 {
         struct proc_dir_entry *p;
@@ -291,9 +255,8 @@ int snmp6_register_dev(struct inet6_dev *idev)
         if (!net->mib.proc_net_devsnmp6)
                 return -ENOENT;
 
-        p = proc_create_data(idev->dev->name, 0444,
-                             net->mib.proc_net_devsnmp6,
-                             &snmp6_dev_seq_fops, idev);
+        p = proc_create_single_data(idev->dev->name, 0444,
+                        net->mib.proc_net_devsnmp6, snmp6_dev_seq_show, idev);
         if (!p)
                 return -ENOMEM;
 
@@ -315,11 +278,12 @@ int snmp6_unregister_dev(struct inet6_dev *idev)
 
 static int __net_init ipv6_proc_init_net(struct net *net)
 {
-        if (!proc_create("sockstat6", 0444, net->proc_net,
-                         &sockstat6_seq_fops))
+        if (!proc_create_net_single("sockstat6", 0444, net->proc_net,
+                        sockstat6_seq_show, NULL))
                 return -ENOMEM;
 
-        if (!proc_create("snmp6", 0444, net->proc_net, &snmp6_seq_fops))
+        if (!proc_create_net_single("snmp6", 0444, net->proc_net,
+                        snmp6_seq_show, NULL))
                 goto proc_snmp6_fail;
 
         net->mib.proc_net_devsnmp6 = proc_mkdir("dev_snmp6", net->proc_net);
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
index 5eb9b08947ed..afc307c89d1a 100644
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
@@ -1304,21 +1304,10 @@ static const struct seq_operations raw6_seq_ops = {
         .show =         raw6_seq_show,
 };
 
-static int raw6_seq_open(struct inode *inode, struct file *file)
-{
-        return raw_seq_open(inode, file, &raw_v6_hashinfo, &raw6_seq_ops);
-}
-
-static const struct file_operations raw6_seq_fops = {
-        .open =         raw6_seq_open,
-        .read =         seq_read,
-        .llseek =       seq_lseek,
-        .release =      seq_release_net,
-};
-
 static int __net_init raw6_init_net(struct net *net)
 {
-        if (!proc_create("raw6", 0444, net->proc_net, &raw6_seq_fops))
+        if (!proc_create_net_data("raw6", 0444, net->proc_net, &raw6_seq_ops,
+                        sizeof(struct raw_iter_state), &raw_v6_hashinfo))
                 return -ENOMEM;
 
         return 0;
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index f4d61736c41a..a6598762d2c1 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -4862,14 +4862,6 @@ static int ip6_route_dev_notify(struct notifier_block *this,
  */
 
 #ifdef CONFIG_PROC_FS
-
-static const struct file_operations ipv6_route_proc_fops = {
-        .open           = ipv6_route_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release_net,
-};
-
 static int rt6_stats_seq_show(struct seq_file *seq, void *v)
 {
         struct net *net = (struct net *)seq->private;
@@ -4884,18 +4876,6 @@ static int rt6_stats_seq_show(struct seq_file *seq, void *v)
 
         return 0;
 }
-
-static int rt6_stats_seq_open(struct inode *inode, struct file *file)
-{
-        return single_open_net(inode, file, rt6_stats_seq_show);
-}
-
-static const struct file_operations rt6_stats_seq_fops = {
-        .open    = rt6_stats_seq_open,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
-        .release = single_release_net,
-};
 #endif  /* CONFIG_PROC_FS */
 
 #ifdef CONFIG_SYSCTL
@@ -5100,8 +5080,10 @@ static void __net_exit ip6_route_net_exit(struct net *net)
 static int __net_init ip6_route_net_init_late(struct net *net)
 {
 #ifdef CONFIG_PROC_FS
-        proc_create("ipv6_route", 0, net->proc_net, &ipv6_route_proc_fops);
-        proc_create("rt6_stats", 0444, net->proc_net, &rt6_stats_seq_fops);
+        proc_create_net("ipv6_route", 0, net->proc_net, &ipv6_route_seq_ops,
+                        sizeof(struct ipv6_route_iter));
+        proc_create_net_single("rt6_stats", 0444, net->proc_net,
+                        rt6_stats_seq_show, NULL);
 #endif
         return 0;
 }
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 6d664d83cd16..d2ce66b23430 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -1909,30 +1909,28 @@ out:
         return 0;
 }
 
-static const struct file_operations tcp6_afinfo_seq_fops = {
-        .open    = tcp_seq_open,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
-        .release = seq_release_net
+static const struct seq_operations tcp6_seq_ops = {
+        .show           = tcp6_seq_show,
+        .start          = tcp_seq_start,
+        .next           = tcp_seq_next,
+        .stop           = tcp_seq_stop,
 };
 
 static struct tcp_seq_afinfo tcp6_seq_afinfo = {
-        .name           = "tcp6",
         .family         = AF_INET6,
-        .seq_fops       = &tcp6_afinfo_seq_fops,
-        .seq_ops        = {
-                .show           = tcp6_seq_show,
-        },
 };
 
 int __net_init tcp6_proc_init(struct net *net)
 {
-        return tcp_proc_register(net, &tcp6_seq_afinfo);
+        if (!proc_create_net_data("tcp6", 0444, net->proc_net, &tcp6_seq_ops,
+                        sizeof(struct tcp_iter_state), &tcp6_seq_afinfo))
+                return -ENOMEM;
+        return 0;
 }
 
 void tcp6_proc_exit(struct net *net)
 {
-        tcp_proc_unregister(net, &tcp6_seq_afinfo);
+        remove_proc_entry("tcp6", net->proc_net);
 }
 #endif
 
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index ea0730028e5d..00e2112da26d 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -1480,31 +1480,30 @@ int udp6_seq_show(struct seq_file *seq, void *v)
         return 0;
 }
 
-static const struct file_operations udp6_afinfo_seq_fops = {
-        .open     = udp_seq_open,
-        .read     = seq_read,
-        .llseek   = seq_lseek,
-        .release  = seq_release_net
+const struct seq_operations udp6_seq_ops = {
+        .start          = udp_seq_start,
+        .next           = udp_seq_next,
+        .stop           = udp_seq_stop,
+        .show           = udp6_seq_show,
 };
+EXPORT_SYMBOL(udp6_seq_ops);
 
 static struct udp_seq_afinfo udp6_seq_afinfo = {
-        .name           = "udp6",
         .family         = AF_INET6,
         .udp_table      = &udp_table,
-        .seq_fops       = &udp6_afinfo_seq_fops,
-        .seq_ops        = {
-                .show           = udp6_seq_show,
-        },
 };
 
 int __net_init udp6_proc_init(struct net *net)
 {
-        return udp_proc_register(net, &udp6_seq_afinfo);
+        if (!proc_create_net_data("udp6", 0444, net->proc_net, &udp6_seq_ops,
+                        sizeof(struct udp_iter_state), &udp6_seq_afinfo))
+                return -ENOMEM;
+        return 0;
 }
 
 void udp6_proc_exit(struct net *net)
 {
-        udp_proc_unregister(net, &udp6_seq_afinfo);
+        remove_proc_entry("udp6", net->proc_net);
 }
 #endif /* CONFIG_PROC_FS */
 
diff --git a/net/ipv6/udplite.c b/net/ipv6/udplite.c
index 14ae32bb1f3d..5000ad6878e6 100644
--- a/net/ipv6/udplite.c
+++ b/net/ipv6/udplite.c
@@ -12,6 +12,7 @@
  *              2 of the License, or (at your option) any later version.
  */
 #include <linux/export.h>
+#include <linux/proc_fs.h>
 #include "udp_impl.h"
 
 static int udplitev6_rcv(struct sk_buff *skb)
@@ -92,32 +93,23 @@ void udplitev6_exit(void)
 }
 
 #ifdef CONFIG_PROC_FS
-
-static const struct file_operations udplite6_afinfo_seq_fops = {
-        .open     = udp_seq_open,
-        .read     = seq_read,
-        .llseek   = seq_lseek,
-        .release  = seq_release_net
-};
-
 static struct udp_seq_afinfo udplite6_seq_afinfo = {
-        .name           = "udplite6",
         .family         = AF_INET6,
         .udp_table      = &udplite_table,
-        .seq_fops       = &udplite6_afinfo_seq_fops,
-        .seq_ops        = {
-                .show           = udp6_seq_show,
-        },
 };
 
 static int __net_init udplite6_proc_init_net(struct net *net)
 {
-        return udp_proc_register(net, &udplite6_seq_afinfo);
+        if (!proc_create_net_data("udplite6", 0444, net->proc_net,
+                        &udp6_seq_ops, sizeof(struct udp_iter_state),
+                        &udplite6_seq_afinfo))
+                return -ENOMEM;
+        return 0;
 }
 
 static void __net_exit udplite6_proc_exit_net(struct net *net)
 {
-        udp_proc_unregister(net, &udplite6_seq_afinfo);
+        remove_proc_entry("udplite6", net->proc_net);
 }
 
 static struct pernet_operations udplite6_net_ops = {
diff --git a/net/kcm/kcmproc.c b/net/kcm/kcmproc.c
index 1fac92543094..370da2f80e3c 100644
--- a/net/kcm/kcmproc.c
+++ b/net/kcm/kcmproc.c
@@ -15,12 +15,6 @@
 #include <net/tcp.h>
 
 #ifdef CONFIG_PROC_FS
-struct kcm_seq_muxinfo {
-        char                            *name;
-        const struct file_operations    *seq_fops;
-        const struct seq_operations     seq_ops;
-};
-
 static struct kcm_mux *kcm_get_first(struct seq_file *seq)
 {
         struct net *net = seq_file_net(seq);
@@ -86,14 +80,6 @@ struct kcm_proc_mux_state {
         int idx;
 };
 
-static int kcm_seq_open(struct inode *inode, struct file *file)
-{
-        struct kcm_seq_muxinfo *muxinfo = PDE_DATA(inode);
-
-        return seq_open_net(inode, file, &muxinfo->seq_ops,
-                           sizeof(struct kcm_proc_mux_state));
-}
-
 static void kcm_format_mux_header(struct seq_file *seq)
 {
         struct net *net = seq_file_net(seq);
@@ -246,44 +232,13 @@ static int kcm_seq_show(struct seq_file *seq, void *v)
         return 0;
 }
 
-static const struct file_operations kcm_seq_fops = {
-        .open           = kcm_seq_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release_net,
+static const struct seq_operations kcm_seq_ops = {
+        .show   = kcm_seq_show,
+        .start  = kcm_seq_start,
+        .next   = kcm_seq_next,
+        .stop   = kcm_seq_stop,
 };
 
-static struct kcm_seq_muxinfo kcm_seq_muxinfo = {
-        .name           = "kcm",
-        .seq_fops       = &kcm_seq_fops,
-        .seq_ops        = {
-                .show   = kcm_seq_show,
-                .start  = kcm_seq_start,
-                .next   = kcm_seq_next,
-                .stop   = kcm_seq_stop,
-        }
-};
-
-static int kcm_proc_register(struct net *net, struct kcm_seq_muxinfo *muxinfo)
-{
-        struct proc_dir_entry *p;
-        int rc = 0;
-
-        p = proc_create_data(muxinfo->name, 0444, net->proc_net,
-                             muxinfo->seq_fops, muxinfo);
-        if (!p)
-                rc = -ENOMEM;
-        return rc;
-}
-EXPORT_SYMBOL(kcm_proc_register);
-
-static void kcm_proc_unregister(struct net *net,
-                                struct kcm_seq_muxinfo *muxinfo)
-{
-        remove_proc_entry(muxinfo->name, net->proc_net);
-}
-EXPORT_SYMBOL(kcm_proc_unregister);
-
 static int kcm_stats_seq_show(struct seq_file *seq, void *v)
 {
         struct kcm_psock_stats psock_stats;
@@ -390,30 +345,14 @@ static int kcm_stats_seq_show(struct seq_file *seq, void *v)
         return 0;
 }
 
-static int kcm_stats_seq_open(struct inode *inode, struct file *file)
-{
-        return single_open_net(inode, file, kcm_stats_seq_show);
-}
-
-static const struct file_operations kcm_stats_seq_fops = {
-        .open    = kcm_stats_seq_open,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
-        .release = single_release_net,
-};
-
 static int kcm_proc_init_net(struct net *net)
 {
-        int err;
-
-        if (!proc_create("kcm_stats", 0444, net->proc_net,
-                         &kcm_stats_seq_fops)) {
-                err = -ENOMEM;
+        if (!proc_create_net_single("kcm_stats", 0444, net->proc_net,
+                         kcm_stats_seq_show, NULL))
                 goto out_kcm_stats;
-        }
 
-        err = kcm_proc_register(net, &kcm_seq_muxinfo);
-        if (err)
+        if (!proc_create_net("kcm", 0444, net->proc_net, &kcm_seq_ops,
+                        sizeof(struct kcm_proc_mux_state)))
                 goto out_kcm;
 
         return 0;
@@ -421,12 +360,12 @@ static int kcm_proc_init_net(struct net *net)
 out_kcm:
         remove_proc_entry("kcm_stats", net->proc_net);
 out_kcm_stats:
-        return err;
+        return -ENOMEM;
 }
 
 static void kcm_proc_exit_net(struct net *net)
 {
-        kcm_proc_unregister(net, &kcm_seq_muxinfo);
+        remove_proc_entry("kcm", net->proc_net);
         remove_proc_entry("kcm_stats", net->proc_net);
 }
 
diff --git a/net/key/af_key.c b/net/key/af_key.c
index e62e52e8f141..5e1d2946ffbf 100644
--- a/net/key/af_key.c
+++ b/net/key/af_key.c
@@ -3812,24 +3812,12 @@ static const struct seq_operations pfkey_seq_ops = {
         .show   = pfkey_seq_show,
 };
 
-static int pfkey_seq_open(struct inode *inode, struct file *file)
-{
-        return seq_open_net(inode, file, &pfkey_seq_ops,
-                            sizeof(struct seq_net_private));
-}
-
-static const struct file_operations pfkey_proc_ops = {
-        .open    = pfkey_seq_open,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
-        .release = seq_release_net,
-};
-
 static int __net_init pfkey_init_proc(struct net *net)
 {
         struct proc_dir_entry *e;
 
-        e = proc_create("pfkey", 0, net->proc_net, &pfkey_proc_ops);
+        e = proc_create_net("pfkey", 0, net->proc_net, &pfkey_seq_ops,
+                        sizeof(struct seq_net_private));
         if (e == NULL)
                 return -ENOMEM;
 
diff --git a/net/l2tp/l2tp_ppp.c b/net/l2tp/l2tp_ppp.c
index 1fd9e145076a..830469766c1f 100644
--- a/net/l2tp/l2tp_ppp.c
+++ b/net/l2tp/l2tp_ppp.c
@@ -1742,24 +1742,6 @@ static const struct seq_operations pppol2tp_seq_ops = {
         .stop           = pppol2tp_seq_stop,
         .show           = pppol2tp_seq_show,
 };
-
-/* Called when our /proc file is opened. We allocate data for use when
- * iterating our tunnel / session contexts and store it in the private
- * data of the seq_file.
- */
-static int pppol2tp_proc_open(struct inode *inode, struct file *file)
-{
-        return seq_open_net(inode, file, &pppol2tp_seq_ops,
-                            sizeof(struct pppol2tp_seq_data));
-}
-
-static const struct file_operations pppol2tp_proc_fops = {
-        .open           = pppol2tp_proc_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release_net,
-};
-
 #endif /* CONFIG_PROC_FS */
 
 /*****************************************************************************
@@ -1771,8 +1753,8 @@ static __net_init int pppol2tp_init_net(struct net *net)
         struct proc_dir_entry *pde;
         int err = 0;
 
-        pde = proc_create("pppol2tp", 0444, net->proc_net,
-                          &pppol2tp_proc_fops);
+        pde = proc_create_net("pppol2tp", 0444, net->proc_net,
+                        &pppol2tp_seq_ops, sizeof(struct pppol2tp_seq_data));
         if (!pde) {
                 err = -ENOMEM;
                 goto out;
diff --git a/net/llc/llc_proc.c b/net/llc/llc_proc.c
index 62ea0aed94b4..f3a36c16a5e7 100644
--- a/net/llc/llc_proc.c
+++ b/net/llc/llc_proc.c
@@ -214,30 +214,6 @@ static const struct seq_operations llc_seq_core_ops = {
         .show   = llc_seq_core_show,
 };
 
-static int llc_seq_socket_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &llc_seq_socket_ops);
-}
-
-static int llc_seq_core_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &llc_seq_core_ops);
-}
-
-static const struct file_operations llc_seq_socket_fops = {
-        .open           = llc_seq_socket_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release,
-};
-
-static const struct file_operations llc_seq_core_fops = {
-        .open           = llc_seq_core_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release,
-};
-
 static struct proc_dir_entry *llc_proc_dir;
 
 int __init llc_proc_init(void)
@@ -249,11 +225,11 @@ int __init llc_proc_init(void)
         if (!llc_proc_dir)
                 goto out;
 
-        p = proc_create("socket", 0444, llc_proc_dir, &llc_seq_socket_fops);
+        p = proc_create_seq("socket", 0444, llc_proc_dir, &llc_seq_socket_ops);
         if (!p)
                 goto out_socket;
 
-        p = proc_create("core", 0444, llc_proc_dir, &llc_seq_core_fops);
+        p = proc_create_seq("core", 0444, llc_proc_dir, &llc_seq_core_ops);
         if (!p)
                 goto out_core;
 
diff --git a/net/netfilter/ipvs/ip_vs_app.c b/net/netfilter/ipvs/ip_vs_app.c
index 1c98c907bc63..c3db074fc1f7 100644
--- a/net/netfilter/ipvs/ip_vs_app.c
+++ b/net/netfilter/ipvs/ip_vs_app.c
@@ -587,25 +587,13 @@ static const struct seq_operations ip_vs_app_seq_ops = {
         .stop  = ip_vs_app_seq_stop,
         .show  = ip_vs_app_seq_show,
 };
-
-static int ip_vs_app_open(struct inode *inode, struct file *file)
-{
-        return seq_open_net(inode, file, &ip_vs_app_seq_ops,
-                            sizeof(struct seq_net_private));
-}
-
-static const struct file_operations ip_vs_app_fops = {
-        .open    = ip_vs_app_open,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
-        .release = seq_release_net,
-};
 #endif
 
 int __net_init ip_vs_app_net_init(struct netns_ipvs *ipvs)
 {
         INIT_LIST_HEAD(&ipvs->app_list);
-        proc_create("ip_vs_app", 0, ipvs->net->proc_net, &ip_vs_app_fops);
+        proc_create_net("ip_vs_app", 0, ipvs->net->proc_net, &ip_vs_app_seq_ops,
+                        sizeof(struct seq_net_private));
         return 0;
 }
 
diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
index 75de46576f51..61c3a389da89 100644
--- a/net/netfilter/ipvs/ip_vs_conn.c
+++ b/net/netfilter/ipvs/ip_vs_conn.c
@@ -1131,19 +1131,6 @@ static const struct seq_operations ip_vs_conn_seq_ops = {
         .show  = ip_vs_conn_seq_show,
 };
 
-static int ip_vs_conn_open(struct inode *inode, struct file *file)
-{
-        return seq_open_net(inode, file, &ip_vs_conn_seq_ops,
-                            sizeof(struct ip_vs_iter_state));
-}
-
-static const struct file_operations ip_vs_conn_fops = {
-        .open    = ip_vs_conn_open,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
-        .release = seq_release_net,
-};
-
 static const char *ip_vs_origin_name(unsigned int flags)
 {
         if (flags & IP_VS_CONN_F_SYNC)
@@ -1207,20 +1194,6 @@ static const struct seq_operations ip_vs_conn_sync_seq_ops = {
         .stop  = ip_vs_conn_seq_stop,
         .show  = ip_vs_conn_sync_seq_show,
 };
-
-static int ip_vs_conn_sync_open(struct inode *inode, struct file *file)
-{
-        return seq_open_net(inode, file, &ip_vs_conn_sync_seq_ops,
-                            sizeof(struct ip_vs_iter_state));
-}
-
-static const struct file_operations ip_vs_conn_sync_fops = {
-        .open    = ip_vs_conn_sync_open,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
-        .release = seq_release_net,
-};
-
 #endif
 
 
@@ -1380,9 +1353,11 @@ int __net_init ip_vs_conn_net_init(struct netns_ipvs *ipvs)
 {
         atomic_set(&ipvs->conn_count, 0);
 
-        proc_create("ip_vs_conn", 0, ipvs->net->proc_net, &ip_vs_conn_fops);
-        proc_create("ip_vs_conn_sync", 0, ipvs->net->proc_net,
-                    &ip_vs_conn_sync_fops);
+        proc_create_net("ip_vs_conn", 0, ipvs->net->proc_net,
+                        &ip_vs_conn_seq_ops, sizeof(struct ip_vs_iter_state));
+        proc_create_net("ip_vs_conn_sync", 0, ipvs->net->proc_net,
+                        &ip_vs_conn_sync_seq_ops,
+                        sizeof(struct ip_vs_iter_state));
         return 0;
 }
 
diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
index 3ecca0616d8c..141b1509c948 100644
--- a/net/netfilter/ipvs/ip_vs_ctl.c
+++ b/net/netfilter/ipvs/ip_vs_ctl.c
@@ -2109,19 +2109,6 @@ static const struct seq_operations ip_vs_info_seq_ops = {
         .show  = ip_vs_info_seq_show,
 };
 
-static int ip_vs_info_open(struct inode *inode, struct file *file)
-{
-        return seq_open_net(inode, file, &ip_vs_info_seq_ops,
-                        sizeof(struct ip_vs_iter));
-}
-
-static const struct file_operations ip_vs_info_fops = {
-        .open    = ip_vs_info_open,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
-        .release = seq_release_net,
-};
-
 static int ip_vs_stats_show(struct seq_file *seq, void *v)
 {
         struct net *net = seq_file_single_net(seq);
@@ -2154,18 +2141,6 @@ static int ip_vs_stats_show(struct seq_file *seq, void *v)
         return 0;
 }
 
-static int ip_vs_stats_seq_open(struct inode *inode, struct file *file)
-{
-        return single_open_net(inode, file, ip_vs_stats_show);
-}
-
-static const struct file_operations ip_vs_stats_fops = {
-        .open = ip_vs_stats_seq_open,
-        .read = seq_read,
-        .llseek = seq_lseek,
-        .release = single_release_net,
-};
-
 static int ip_vs_stats_percpu_show(struct seq_file *seq, void *v)
 {
         struct net *net = seq_file_single_net(seq);
@@ -2221,18 +2196,6 @@ static int ip_vs_stats_percpu_show(struct seq_file *seq, void *v)
 
         return 0;
 }
-
-static int ip_vs_stats_percpu_seq_open(struct inode *inode, struct file *file)
-{
-        return single_open_net(inode, file, ip_vs_stats_percpu_show);
-}
-
-static const struct file_operations ip_vs_stats_percpu_fops = {
-        .open = ip_vs_stats_percpu_seq_open,
-        .read = seq_read,
-        .llseek = seq_lseek,
-        .release = single_release_net,
-};
 #endif
 
 /*
@@ -4039,10 +4002,12 @@ int __net_init ip_vs_control_net_init(struct netns_ipvs *ipvs)
 
         spin_lock_init(&ipvs->tot_stats.lock);
 
-        proc_create("ip_vs", 0, ipvs->net->proc_net, &ip_vs_info_fops);
-        proc_create("ip_vs_stats", 0, ipvs->net->proc_net, &ip_vs_stats_fops);
-        proc_create("ip_vs_stats_percpu", 0, ipvs->net->proc_net,
-                    &ip_vs_stats_percpu_fops);
+        proc_create_net("ip_vs", 0, ipvs->net->proc_net, &ip_vs_info_seq_ops,
+                        sizeof(struct ip_vs_iter));
+        proc_create_net_single("ip_vs_stats", 0, ipvs->net->proc_net,
+                        ip_vs_stats_show, NULL);
+        proc_create_net_single("ip_vs_stats_percpu", 0, ipvs->net->proc_net,
+                        ip_vs_stats_percpu_show, NULL);
 
         if (ip_vs_control_net_init_sysctl(ipvs))
                 goto err;
diff --git a/net/netfilter/nf_conntrack_expect.c b/net/netfilter/nf_conntrack_expect.c
index 4b2b3d53acfc..853b23206bb7 100644
--- a/net/netfilter/nf_conntrack_expect.c
+++ b/net/netfilter/nf_conntrack_expect.c
@@ -644,19 +644,6 @@ static const struct seq_operations exp_seq_ops = {
         .stop = exp_seq_stop,
         .show = exp_seq_show
 };
-
-static int exp_open(struct inode *inode, struct file *file)
-{
-        return seq_open_net(inode, file, &exp_seq_ops,
-                        sizeof(struct ct_expect_iter_state));
-}
-
-static const struct file_operations exp_file_ops = {
-        .open    = exp_open,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
-        .release = seq_release_net,
-};
 #endif /* CONFIG_NF_CONNTRACK_PROCFS */
 
 static int exp_proc_init(struct net *net)
@@ -666,8 +653,8 @@ static int exp_proc_init(struct net *net)
         kuid_t root_uid;
         kgid_t root_gid;
 
-        proc = proc_create("nf_conntrack_expect", 0440, net->proc_net,
-                           &exp_file_ops);
+        proc = proc_create_net("nf_conntrack_expect", 0440, net->proc_net,
+                        &exp_seq_ops, sizeof(struct ct_expect_iter_state));
         if (!proc)
                 return -ENOMEM;
 
diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
index 037fec54c850..b642c0b2495c 100644
--- a/net/netfilter/nf_conntrack_standalone.c
+++ b/net/netfilter/nf_conntrack_standalone.c
@@ -375,19 +375,6 @@ static const struct seq_operations ct_seq_ops = {
         .show  = ct_seq_show
 };
 
-static int ct_open(struct inode *inode, struct file *file)
-{
-        return seq_open_net(inode, file, &ct_seq_ops,
-                        sizeof(struct ct_iter_state));
-}
-
-static const struct file_operations ct_file_ops = {
-        .open    = ct_open,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
-        .release = seq_release_net,
-};
-
 static void *ct_cpu_seq_start(struct seq_file *seq, loff_t *pos)
 {
         struct net *net = seq_file_net(seq);
@@ -467,26 +454,14 @@ static const struct seq_operations ct_cpu_seq_ops = {
         .show   = ct_cpu_seq_show,
 };
 
-static int ct_cpu_seq_open(struct inode *inode, struct file *file)
-{
-        return seq_open_net(inode, file, &ct_cpu_seq_ops,
-                            sizeof(struct seq_net_private));
-}
-
-static const struct file_operations ct_cpu_seq_fops = {
-        .open    = ct_cpu_seq_open,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
-        .release = seq_release_net,
-};
-
 static int nf_conntrack_standalone_init_proc(struct net *net)
 {
         struct proc_dir_entry *pde;
         kuid_t root_uid;
         kgid_t root_gid;
 
-        pde = proc_create("nf_conntrack", 0440, net->proc_net, &ct_file_ops);
+        pde = proc_create_net("nf_conntrack", 0440, net->proc_net, &ct_seq_ops,
+                        sizeof(struct ct_iter_state));
         if (!pde)
                 goto out_nf_conntrack;
 
@@ -495,8 +470,8 @@ static int nf_conntrack_standalone_init_proc(struct net *net)
         if (uid_valid(root_uid) && gid_valid(root_gid))
                 proc_set_user(pde, root_uid, root_gid);
 
-        pde = proc_create("nf_conntrack", 0444, net->proc_net_stat,
-                          &ct_cpu_seq_fops);
+        pde = proc_create_net("nf_conntrack", 0444, net->proc_net_stat,
+                        &ct_cpu_seq_ops, sizeof(struct seq_net_private));
         if (!pde)
                 goto out_stat_nf_conntrack;
         return 0;
diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c
index 6d0357817cda..426457047578 100644
--- a/net/netfilter/nf_log.c
+++ b/net/netfilter/nf_log.c
@@ -394,21 +394,6 @@ static const struct seq_operations nflog_seq_ops = {
         .stop   = seq_stop,
         .show   = seq_show,
 };
-
-static int nflog_open(struct inode *inode, struct file *file)
-{
-        return seq_open_net(inode, file, &nflog_seq_ops,
-                            sizeof(struct seq_net_private));
-}
-
-static const struct file_operations nflog_file_ops = {
-        .open    = nflog_open,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
-        .release = seq_release_net,
-};
-
-
 #endif /* PROC_FS */
 
 #ifdef CONFIG_SYSCTL
@@ -549,8 +534,8 @@ static int __net_init nf_log_net_init(struct net *net)
         int ret = -ENOMEM;
 
 #ifdef CONFIG_PROC_FS
-        if (!proc_create("nf_log", 0444,
-                         net->nf.proc_netfilter, &nflog_file_ops))
+        if (!proc_create_net("nf_log", 0444, net->nf.proc_netfilter,
+                        &nflog_seq_ops, sizeof(struct seq_net_private)))
                 return ret;
 #endif
         ret = netfilter_log_sysctl_init(net);
diff --git a/net/netfilter/nf_synproxy_core.c b/net/netfilter/nf_synproxy_core.c
index 6039b350abbe..8ff4d22f10b2 100644
--- a/net/netfilter/nf_synproxy_core.c
+++ b/net/netfilter/nf_synproxy_core.c
@@ -310,23 +310,10 @@ static const struct seq_operations synproxy_cpu_seq_ops = {
         .show           = synproxy_cpu_seq_show,
 };
 
-static int synproxy_cpu_seq_open(struct inode *inode, struct file *file)
-{
-        return seq_open_net(inode, file, &synproxy_cpu_seq_ops,
-                            sizeof(struct seq_net_private));
-}
-
-static const struct file_operations synproxy_cpu_seq_fops = {
-        .open           = synproxy_cpu_seq_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release_net,
-};
-
 static int __net_init synproxy_proc_init(struct net *net)
 {
-        if (!proc_create("synproxy", 0444, net->proc_net_stat,
-                         &synproxy_cpu_seq_fops))
+        if (!proc_create_net("synproxy", 0444, net->proc_net_stat,
+                        &synproxy_cpu_seq_ops, sizeof(struct seq_net_private)))
                 return -ENOMEM;
         return 0;
 }
diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
index 7b46aa4c478d..c14822b9729f 100644
--- a/net/netfilter/nfnetlink_log.c
+++ b/net/netfilter/nfnetlink_log.c
@@ -1046,20 +1046,6 @@ static const struct seq_operations nful_seq_ops = {
         .stop   = seq_stop,
         .show   = seq_show,
 };
-
-static int nful_open(struct inode *inode, struct file *file)
-{
-        return seq_open_net(inode, file, &nful_seq_ops,
-                            sizeof(struct iter_state));
-}
-
-static const struct file_operations nful_file_ops = {
-        .open    = nful_open,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
-        .release = seq_release_net,
-};
-
 #endif /* PROC_FS */
 
 static int __net_init nfnl_log_net_init(struct net *net)
@@ -1077,8 +1063,8 @@ static int __net_init nfnl_log_net_init(struct net *net)
         spin_lock_init(&log->instances_lock);
 
 #ifdef CONFIG_PROC_FS
-        proc = proc_create("nfnetlink_log", 0440,
-                           net->nf.proc_netfilter, &nful_file_ops);
+        proc = proc_create_net("nfnetlink_log", 0440, net->nf.proc_netfilter,
+                        &nful_seq_ops, sizeof(struct iter_state));
         if (!proc)
                 return -ENOMEM;
 
diff --git a/net/netfilter/nfnetlink_queue.c b/net/netfilter/nfnetlink_queue.c
index 74a04638ef03..494a9ab35cb6 100644
--- a/net/netfilter/nfnetlink_queue.c
+++ b/net/netfilter/nfnetlink_queue.c
@@ -1469,20 +1469,6 @@ static const struct seq_operations nfqnl_seq_ops = {
         .stop   = seq_stop,
         .show   = seq_show,
 };
-
-static int nfqnl_open(struct inode *inode, struct file *file)
-{
-        return seq_open_net(inode, file, &nfqnl_seq_ops,
-                        sizeof(struct iter_state));
-}
-
-static const struct file_operations nfqnl_file_ops = {
-        .open    = nfqnl_open,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
-        .release = seq_release_net,
-};
-
 #endif /* PROC_FS */
 
 static int __net_init nfnl_queue_net_init(struct net *net)
@@ -1496,8 +1482,8 @@ static int __net_init nfnl_queue_net_init(struct net *net)
         spin_lock_init(&q->instances_lock);
 
 #ifdef CONFIG_PROC_FS
-        if (!proc_create("nfnetlink_queue", 0440,
-                         net->nf.proc_netfilter, &nfqnl_file_ops))
+        if (!proc_create_net("nfnetlink_queue", 0440, net->nf.proc_netfilter,
+                        &nfqnl_seq_ops, sizeof(struct iter_state)))
                 return -ENOMEM;
 #endif
         nf_register_queue_handler(net, &nfqh);
diff --git a/net/netfilter/x_tables.c b/net/netfilter/x_tables.c
index cb7cb300c3bc..55cb4d197184 100644
--- a/net/netfilter/x_tables.c
+++ b/net/netfilter/x_tables.c
@@ -1495,15 +1495,10 @@ void *xt_unregister_table(struct xt_table *table)
 EXPORT_SYMBOL_GPL(xt_unregister_table);
 
 #ifdef CONFIG_PROC_FS
-struct xt_names_priv {
-        struct seq_net_private p;
-        u_int8_t af;
-};
 static void *xt_table_seq_start(struct seq_file *seq, loff_t *pos)
 {
-        struct xt_names_priv *priv = seq->private;
         struct net *net = seq_file_net(seq);
-        u_int8_t af = priv->af;
+        u_int8_t af = (unsigned long)PDE_DATA(file_inode(seq->file));
 
         mutex_lock(&xt[af].mutex);
         return seq_list_start(&net->xt.tables[af], *pos);
@@ -1511,17 +1506,15 @@ static void *xt_table_seq_start(struct seq_file *seq, loff_t *pos)
 
 static void *xt_table_seq_next(struct seq_file *seq, void *v, loff_t *pos)
 {
-        struct xt_names_priv *priv = seq->private;
         struct net *net = seq_file_net(seq);
-        u_int8_t af = priv->af;
+        u_int8_t af = (unsigned long)PDE_DATA(file_inode(seq->file));
 
         return seq_list_next(v, &net->xt.tables[af], pos);
 }
 
 static void xt_table_seq_stop(struct seq_file *seq, void *v)
 {
-        struct xt_names_priv *priv = seq->private;
-        u_int8_t af = priv->af;
+        u_int8_t af = (unsigned long)PDE_DATA(file_inode(seq->file));
 
         mutex_unlock(&xt[af].mutex);
 }
@@ -1542,34 +1535,13 @@ static const struct seq_operations xt_table_seq_ops = {
         .show   = xt_table_seq_show,
 };
 
-static int xt_table_open(struct inode *inode, struct file *file)
-{
-        int ret;
-        struct xt_names_priv *priv;
-
-        ret = seq_open_net(inode, file, &xt_table_seq_ops,
-                           sizeof(struct xt_names_priv));
-        if (!ret) {
-                priv = ((struct seq_file *)file->private_data)->private;
-                priv->af = (unsigned long)PDE_DATA(inode);
-        }
-        return ret;
-}
-
-static const struct file_operations xt_table_ops = {
-        .open    = xt_table_open,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
-        .release = seq_release_net,
-};
-
 /*
  * Traverse state for ip{,6}_{tables,matches} for helping crossing
  * the multi-AF mutexes.
  */
 struct nf_mttg_trav {
         struct list_head *head, *curr;
-        uint8_t class, nfproto;
+        uint8_t class;
 };
 
 enum {
@@ -1586,6 +1558,7 @@ static void *xt_mttg_seq_next(struct seq_file *seq, void *v, loff_t *ppos,
                 [MTTG_TRAV_NFP_UNSPEC] = MTTG_TRAV_NFP_SPEC,
                 [MTTG_TRAV_NFP_SPEC]   = MTTG_TRAV_DONE,
         };
+        uint8_t nfproto = (unsigned long)PDE_DATA(file_inode(seq->file));
         struct nf_mttg_trav *trav = seq->private;
 
         switch (trav->class) {
@@ -1600,9 +1573,9 @@ static void *xt_mttg_seq_next(struct seq_file *seq, void *v, loff_t *ppos,
                 if (trav->curr != trav->head)
                         break;
                 mutex_unlock(&xt[NFPROTO_UNSPEC].mutex);
-                mutex_lock(&xt[trav->nfproto].mutex);
+                mutex_lock(&xt[nfproto].mutex);
                 trav->head = trav->curr = is_target ?
-                        &xt[trav->nfproto].target : &xt[trav->nfproto].match;
+                        &xt[nfproto].target : &xt[nfproto].match;
                 trav->class = next_class[trav->class];
                 break;
         case MTTG_TRAV_NFP_SPEC:
@@ -1634,6 +1607,7 @@ static void *xt_mttg_seq_start(struct seq_file *seq, loff_t *pos,
 
 static void xt_mttg_seq_stop(struct seq_file *seq, void *v)
 {
+        uint8_t nfproto = (unsigned long)PDE_DATA(file_inode(seq->file));
         struct nf_mttg_trav *trav = seq->private;
 
         switch (trav->class) {
@@ -1641,7 +1615,7 @@ static void xt_mttg_seq_stop(struct seq_file *seq, void *v)
                 mutex_unlock(&xt[NFPROTO_UNSPEC].mutex);
                 break;
         case MTTG_TRAV_NFP_SPEC:
-                mutex_unlock(&xt[trav->nfproto].mutex);
+                mutex_unlock(&xt[nfproto].mutex);
                 break;
         }
 }
@@ -1680,24 +1654,6 @@ static const struct seq_operations xt_match_seq_ops = {
         .show   = xt_match_seq_show,
 };
 
-static int xt_match_open(struct inode *inode, struct file *file)
-{
-        struct nf_mttg_trav *trav;
-        trav = __seq_open_private(file, &xt_match_seq_ops, sizeof(*trav));
-        if (!trav)
-                return -ENOMEM;
-
-        trav->nfproto = (unsigned long)PDE_DATA(inode);
-        return 0;
-}
-
-static const struct file_operations xt_match_ops = {
-        .open    = xt_match_open,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
-        .release = seq_release_private,
-};
-
 static void *xt_target_seq_start(struct seq_file *seq, loff_t *pos)
 {
         return xt_mttg_seq_start(seq, pos, true);
@@ -1732,24 +1688,6 @@ static const struct seq_operations xt_target_seq_ops = {
         .show   = xt_target_seq_show,
 };
 
-static int xt_target_open(struct inode *inode, struct file *file)
-{
-        struct nf_mttg_trav *trav;
-        trav = __seq_open_private(file, &xt_target_seq_ops, sizeof(*trav));
-        if (!trav)
-                return -ENOMEM;
-
-        trav->nfproto = (unsigned long)PDE_DATA(inode);
-        return 0;
-}
-
-static const struct file_operations xt_target_ops = {
-        .open    = xt_target_open,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
-        .release = seq_release_private,
-};
-
 #define FORMAT_TABLES   "_tables_names"
 #define FORMAT_MATCHES  "_tables_matches"
 #define FORMAT_TARGETS  "_tables_targets"
@@ -1813,8 +1751,9 @@ int xt_proto_init(struct net *net, u_int8_t af)
 
         strlcpy(buf, xt_prefix[af], sizeof(buf));
         strlcat(buf, FORMAT_TABLES, sizeof(buf));
-        proc = proc_create_data(buf, 0440, net->proc_net, &xt_table_ops,
-                                (void *)(unsigned long)af);
+        proc = proc_create_net_data(buf, 0440, net->proc_net, &xt_table_seq_ops,
+                        sizeof(struct seq_net_private),
+                        (void *)(unsigned long)af);
         if (!proc)
                 goto out;
         if (uid_valid(root_uid) && gid_valid(root_gid))
@@ -1822,8 +1761,9 @@ int xt_proto_init(struct net *net, u_int8_t af)
 
         strlcpy(buf, xt_prefix[af], sizeof(buf));
         strlcat(buf, FORMAT_MATCHES, sizeof(buf));
-        proc = proc_create_data(buf, 0440, net->proc_net, &xt_match_ops,
-                                (void *)(unsigned long)af);
+        proc = proc_create_seq_private(buf, 0440, net->proc_net,
+                        &xt_match_seq_ops, sizeof(struct nf_mttg_trav),
+                        (void *)(unsigned long)af);
         if (!proc)
                 goto out_remove_tables;
         if (uid_valid(root_uid) && gid_valid(root_gid))
@@ -1831,8 +1771,9 @@ int xt_proto_init(struct net *net, u_int8_t af)
 
         strlcpy(buf, xt_prefix[af], sizeof(buf));
         strlcat(buf, FORMAT_TARGETS, sizeof(buf));
-        proc = proc_create_data(buf, 0440, net->proc_net, &xt_target_ops,
-                                (void *)(unsigned long)af);
+        proc = proc_create_seq_private(buf, 0440, net->proc_net,
+                         &xt_target_seq_ops, sizeof(struct nf_mttg_trav),
+                         (void *)(unsigned long)af);
         if (!proc)
                 goto out_remove_matches;
         if (uid_valid(root_uid) && gid_valid(root_gid))
diff --git a/net/netfilter/xt_hashlimit.c b/net/netfilter/xt_hashlimit.c
index 0cd73567e7ff..9b16402f29af 100644
--- a/net/netfilter/xt_hashlimit.c
+++ b/net/netfilter/xt_hashlimit.c
@@ -57,9 +57,9 @@ static inline struct hashlimit_net *hashlimit_pernet(struct net *net)
 }
 
 /* need to declare this at the top */
-static const struct file_operations dl_file_ops_v2;
-static const struct file_operations dl_file_ops_v1;
-static const struct file_operations dl_file_ops;
+static const struct seq_operations dl_seq_ops_v2;
+static const struct seq_operations dl_seq_ops_v1;
+static const struct seq_operations dl_seq_ops;
 
 /* hash table crap */
 struct dsthash_dst {
@@ -272,7 +272,7 @@ static int htable_create(struct net *net, struct hashlimit_cfg3 *cfg,
 {
         struct hashlimit_net *hashlimit_net = hashlimit_pernet(net);
         struct xt_hashlimit_htable *hinfo;
-        const struct file_operations *fops;
+        const struct seq_operations *ops;
         unsigned int size, i;
         int ret;
 
@@ -321,19 +321,19 @@ static int htable_create(struct net *net, struct hashlimit_cfg3 *cfg,
 
         switch (revision) {
         case 1:
-                fops = &dl_file_ops_v1;
+                ops = &dl_seq_ops_v1;
                 break;
         case 2:
-                fops = &dl_file_ops_v2;
+                ops = &dl_seq_ops_v2;
                 break;
         default:
-                fops = &dl_file_ops;
+                ops = &dl_seq_ops;
         }
 
-        hinfo->pde = proc_create_data(name, 0,
+        hinfo->pde = proc_create_seq_data(name, 0,
                 (family == NFPROTO_IPV4) ?
                 hashlimit_net->ipt_hashlimit : hashlimit_net->ip6t_hashlimit,
-                fops, hinfo);
+                ops, hinfo);
         if (hinfo->pde == NULL) {
                 kfree(hinfo->name);
                 vfree(hinfo);
@@ -1057,7 +1057,7 @@ static struct xt_match hashlimit_mt_reg[] __read_mostly = {
 static void *dl_seq_start(struct seq_file *s, loff_t *pos)
         __acquires(htable->lock)
 {
-        struct xt_hashlimit_htable *htable = s->private;
+        struct xt_hashlimit_htable *htable = PDE_DATA(file_inode(s->private));
         unsigned int *bucket;
 
         spin_lock_bh(&htable->lock);
@@ -1074,7 +1074,7 @@ static void *dl_seq_start(struct seq_file *s, loff_t *pos)
 
 static void *dl_seq_next(struct seq_file *s, void *v, loff_t *pos)
 {
-        struct xt_hashlimit_htable *htable = s->private;
+        struct xt_hashlimit_htable *htable = PDE_DATA(file_inode(s->private));
         unsigned int *bucket = v;
 
         *pos = ++(*bucket);
@@ -1088,7 +1088,7 @@ static void *dl_seq_next(struct seq_file *s, void *v, loff_t *pos)
 static void dl_seq_stop(struct seq_file *s, void *v)
         __releases(htable->lock)
 {
-        struct xt_hashlimit_htable *htable = s->private;
+        struct xt_hashlimit_htable *htable = PDE_DATA(file_inode(s->private));
         unsigned int *bucket = v;
 
         if (!IS_ERR(bucket))
@@ -1130,7 +1130,7 @@ static void dl_seq_print(struct dsthash_ent *ent, u_int8_t family,
 static int dl_seq_real_show_v2(struct dsthash_ent *ent, u_int8_t family,
                                struct seq_file *s)
 {
-        const struct xt_hashlimit_htable *ht = s->private;
+        struct xt_hashlimit_htable *ht = PDE_DATA(file_inode(s->private));
 
         spin_lock(&ent->lock);
         /* recalculate to show accurate numbers */
@@ -1145,7 +1145,7 @@ static int dl_seq_real_show_v2(struct dsthash_ent *ent, u_int8_t family,
 static int dl_seq_real_show_v1(struct dsthash_ent *ent, u_int8_t family,
                                struct seq_file *s)
 {
-        const struct xt_hashlimit_htable *ht = s->private;
+        struct xt_hashlimit_htable *ht = PDE_DATA(file_inode(s->private));
 
         spin_lock(&ent->lock);
         /* recalculate to show accurate numbers */
@@ -1160,7 +1160,7 @@ static int dl_seq_real_show_v1(struct dsthash_ent *ent, u_int8_t family,
 static int dl_seq_real_show(struct dsthash_ent *ent, u_int8_t family,
                             struct seq_file *s)
 {
-        const struct xt_hashlimit_htable *ht = s->private;
+        struct xt_hashlimit_htable *ht = PDE_DATA(file_inode(s->private));
 
         spin_lock(&ent->lock);
         /* recalculate to show accurate numbers */
@@ -1174,7 +1174,7 @@ static int dl_seq_real_show(struct dsthash_ent *ent, u_int8_t family,
 
 static int dl_seq_show_v2(struct seq_file *s, void *v)
 {
-        struct xt_hashlimit_htable *htable = s->private;
+        struct xt_hashlimit_htable *htable = PDE_DATA(file_inode(s->private));
         unsigned int *bucket = (unsigned int *)v;
         struct dsthash_ent *ent;
 
@@ -1188,7 +1188,7 @@ static int dl_seq_show_v2(struct seq_file *s, void *v)
 
 static int dl_seq_show_v1(struct seq_file *s, void *v)
 {
-        struct xt_hashlimit_htable *htable = s->private;
+        struct xt_hashlimit_htable *htable = PDE_DATA(file_inode(s->private));
         unsigned int *bucket = v;
         struct dsthash_ent *ent;
 
@@ -1202,7 +1202,7 @@ static int dl_seq_show_v1(struct seq_file *s, void *v)
 
 static int dl_seq_show(struct seq_file *s, void *v)
 {
-        struct xt_hashlimit_htable *htable = s->private;
+        struct xt_hashlimit_htable *htable = PDE_DATA(file_inode(s->private));
         unsigned int *bucket = v;
         struct dsthash_ent *ent;
 
@@ -1235,62 +1235,6 @@ static const struct seq_operations dl_seq_ops = {
         .show  = dl_seq_show
 };
 
-static int dl_proc_open_v2(struct inode *inode, struct file *file)
-{
-        int ret = seq_open(file, &dl_seq_ops_v2);
-
-        if (!ret) {
-                struct seq_file *sf = file->private_data;
-
-                sf->private = PDE_DATA(inode);
-        }
-        return ret;
-}
-
-static int dl_proc_open_v1(struct inode *inode, struct file *file)
-{
-        int ret = seq_open(file, &dl_seq_ops_v1);
-
-        if (!ret) {
-                struct seq_file *sf = file->private_data;
-                sf->private = PDE_DATA(inode);
-        }
-        return ret;
-}
-
-static int dl_proc_open(struct inode *inode, struct file *file)
-{
-        int ret = seq_open(file, &dl_seq_ops);
-
-        if (!ret) {
-                struct seq_file *sf = file->private_data;
-
-                sf->private = PDE_DATA(inode);
-        }
-        return ret;
-}
-
-static const struct file_operations dl_file_ops_v2 = {
-        .open    = dl_proc_open_v2,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
-        .release = seq_release
-};
-
-static const struct file_operations dl_file_ops_v1 = {
-        .open    = dl_proc_open_v1,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
-        .release = seq_release
-};
-
-static const struct file_operations dl_file_ops = {
-        .open    = dl_proc_open,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
-        .release = seq_release
-};
-
 static int __net_init hashlimit_proc_net_init(struct net *net)
 {
         struct hashlimit_net *hashlimit_net = hashlimit_pernet(net);
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
index 2e2dd88fc79f..393573a99a5a 100644
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -2635,21 +2635,6 @@ static const struct seq_operations netlink_seq_ops = {
         .stop   = netlink_seq_stop,
         .show   = netlink_seq_show,
 };
-
-
-static int netlink_seq_open(struct inode *inode, struct file *file)
-{
-        return seq_open_net(inode, file, &netlink_seq_ops,
-                                sizeof(struct nl_seq_iter));
-}
-
-static const struct file_operations netlink_seq_fops = {
-        .open           = netlink_seq_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release_net,
-};
-
 #endif
 
 int netlink_register_notifier(struct notifier_block *nb)
@@ -2694,7 +2679,8 @@ static const struct net_proto_family netlink_family_ops = {
 static int __net_init netlink_net_init(struct net *net)
 {
 #ifdef CONFIG_PROC_FS
-        if (!proc_create("netlink", 0, net->proc_net, &netlink_seq_fops))
+        if (!proc_create_net("netlink", 0, net->proc_net, &netlink_seq_ops,
+                        sizeof(struct nl_seq_iter)))
                 return -ENOMEM;
 #endif
         return 0;
diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c
index 4221d98a314b..c2888c78d4c1 100644
--- a/net/netrom/af_netrom.c
+++ b/net/netrom/af_netrom.c
@@ -1338,18 +1338,6 @@ static const struct seq_operations nr_info_seqops = {
         .stop = nr_info_stop,
         .show = nr_info_show,
 };
-
-static int nr_info_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &nr_info_seqops);
-}
-
-static const struct file_operations nr_info_fops = {
-        .open = nr_info_open,
-        .read = seq_read,
-        .llseek = seq_lseek,
-        .release = seq_release,
-};
 #endif  /* CONFIG_PROC_FS */
 
 static const struct net_proto_family nr_family_ops = {
@@ -1450,9 +1438,9 @@ static int __init nr_proto_init(void)
 
         nr_loopback_init();
 
-        proc_create("nr", 0444, init_net.proc_net, &nr_info_fops);
-        proc_create("nr_neigh", 0444, init_net.proc_net, &nr_neigh_fops);
-        proc_create("nr_nodes", 0444, init_net.proc_net, &nr_nodes_fops);
+        proc_create_seq("nr", 0444, init_net.proc_net, &nr_info_seqops);
+        proc_create_seq("nr_neigh", 0444, init_net.proc_net, &nr_neigh_seqops);
+        proc_create_seq("nr_nodes", 0444, init_net.proc_net, &nr_node_seqops);
 out:
         return rc;
 fail:
diff --git a/net/netrom/nr_route.c b/net/netrom/nr_route.c
index b5a7dcb30991..6485f593e2f0 100644
--- a/net/netrom/nr_route.c
+++ b/net/netrom/nr_route.c
@@ -888,25 +888,13 @@ static int nr_node_show(struct seq_file *seq, void *v)
         return 0;
 }
 
-static const struct seq_operations nr_node_seqops = {
+const struct seq_operations nr_node_seqops = {
         .start = nr_node_start,
         .next = nr_node_next,
         .stop = nr_node_stop,
         .show = nr_node_show,
 };
 
-static int nr_node_info_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &nr_node_seqops);
-}
-
-const struct file_operations nr_nodes_fops = {
-        .open = nr_node_info_open,
-        .read = seq_read,
-        .llseek = seq_lseek,
-        .release = seq_release,
-};
-
 static void *nr_neigh_start(struct seq_file *seq, loff_t *pos)
 {
         spin_lock_bh(&nr_neigh_list_lock);
@@ -954,25 +942,12 @@ static int nr_neigh_show(struct seq_file *seq, void *v)
         return 0;
 }
 
-static const struct seq_operations nr_neigh_seqops = {
+const struct seq_operations nr_neigh_seqops = {
         .start = nr_neigh_start,
         .next = nr_neigh_next,
         .stop = nr_neigh_stop,
         .show = nr_neigh_show,
 };
-
-static int nr_neigh_info_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &nr_neigh_seqops);
-}
-
-const struct file_operations nr_neigh_fops = {
-        .open = nr_neigh_info_open,
-        .read = seq_read,
-        .llseek = seq_lseek,
-        .release = seq_release,
-};
-
 #endif
 
 /*
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index acb7b86574cd..f9cdd27a7f6f 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -4556,20 +4556,6 @@ static const struct seq_operations packet_seq_ops = {
         .stop   = packet_seq_stop,
         .show   = packet_seq_show,
 };
-
-static int packet_seq_open(struct inode *inode, struct file *file)
-{
-        return seq_open_net(inode, file, &packet_seq_ops,
-                            sizeof(struct seq_net_private));
-}
-
-static const struct file_operations packet_seq_fops = {
-        .open           = packet_seq_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release_net,
-};
-
 #endif
 
 static int __net_init packet_net_init(struct net *net)
@@ -4577,7 +4563,8 @@ static int __net_init packet_net_init(struct net *net)
         mutex_init(&net->packet.sklist_lock);
         INIT_HLIST_HEAD(&net->packet.sklist);
 
-        if (!proc_create("packet", 0, net->proc_net, &packet_seq_fops))
+        if (!proc_create_net("packet", 0, net->proc_net, &packet_seq_ops,
+                        sizeof(struct seq_net_private)))
                 return -ENOMEM;
 
         return 0;
diff --git a/net/phonet/pn_dev.c b/net/phonet/pn_dev.c
index 77787512fc32..6cb4f602ab71 100644
--- a/net/phonet/pn_dev.c
+++ b/net/phonet/pn_dev.c
@@ -320,7 +320,8 @@ static int __net_init phonet_init_net(struct net *net)
 {
         struct phonet_net *pnn = phonet_pernet(net);
 
-        if (!proc_create("phonet", 0, net->proc_net, &pn_sock_seq_fops))
+        if (!proc_create_net("phonet", 0, net->proc_net, &pn_sock_seq_ops,
+                        sizeof(struct seq_net_private)))
                 return -ENOMEM;
 
         INIT_LIST_HEAD(&pnn->pndevs.list);
@@ -351,7 +352,8 @@ int __init phonet_device_init(void)
         if (err)
                 return err;
 
-        proc_create("pnresource", 0, init_net.proc_net, &pn_res_seq_fops);
+        proc_create_net("pnresource", 0, init_net.proc_net, &pn_res_seq_ops,
+                        sizeof(struct seq_net_private));
         register_netdevice_notifier(&phonet_device_notifier);
         err = phonet_netlink_register();
         if (err)
diff --git a/net/phonet/socket.c b/net/phonet/socket.c
index f9b40e6a18a5..30187990257f 100644
--- a/net/phonet/socket.c
+++ b/net/phonet/socket.c
@@ -620,25 +620,12 @@ static int pn_sock_seq_show(struct seq_file *seq, void *v)
         return 0;
 }
 
-static const struct seq_operations pn_sock_seq_ops = {
+const struct seq_operations pn_sock_seq_ops = {
         .start = pn_sock_seq_start,
         .next = pn_sock_seq_next,
         .stop = pn_sock_seq_stop,
         .show = pn_sock_seq_show,
 };
-
-static int pn_sock_open(struct inode *inode, struct file *file)
-{
-        return seq_open_net(inode, file, &pn_sock_seq_ops,
-                                sizeof(struct seq_net_private));
-}
-
-const struct file_operations pn_sock_seq_fops = {
-        .open = pn_sock_open,
-        .read = seq_read,
-        .llseek = seq_lseek,
-        .release = seq_release_net,
-};
 #endif
 
 static struct  {
@@ -802,23 +789,10 @@ static int pn_res_seq_show(struct seq_file *seq, void *v)
         return 0;
 }
 
-static const struct seq_operations pn_res_seq_ops = {
+const struct seq_operations pn_res_seq_ops = {
         .start = pn_res_seq_start,
         .next = pn_res_seq_next,
         .stop = pn_res_seq_stop,
         .show = pn_res_seq_show,
 };
-
-static int pn_res_open(struct inode *inode, struct file *file)
-{
-        return seq_open_net(inode, file, &pn_res_seq_ops,
-                                sizeof(struct seq_net_private));
-}
-
-const struct file_operations pn_res_seq_fops = {
-        .open = pn_res_open,
-        .read = seq_read,
-        .llseek = seq_lseek,
-        .release = seq_release_net,
-};
 #endif
diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c
index 9ff5e0a76593..22a7f2b413ac 100644
--- a/net/rose/af_rose.c
+++ b/net/rose/af_rose.c
@@ -1453,18 +1453,6 @@ static const struct seq_operations rose_info_seqops = {
         .stop = rose_info_stop,
         .show = rose_info_show,
 };
-
-static int rose_info_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &rose_info_seqops);
-}
-
-static const struct file_operations rose_info_fops = {
-        .open = rose_info_open,
-        .read = seq_read,
-        .llseek = seq_lseek,
-        .release = seq_release,
-};
 #endif  /* CONFIG_PROC_FS */
 
 static const struct net_proto_family rose_family_ops = {
@@ -1567,13 +1555,13 @@ static int __init rose_proto_init(void)
 
         rose_add_loopback_neigh();
 
-        proc_create("rose", 0444, init_net.proc_net, &rose_info_fops);
-        proc_create("rose_neigh", 0444, init_net.proc_net,
-                    &rose_neigh_fops);
-        proc_create("rose_nodes", 0444, init_net.proc_net,
-                    &rose_nodes_fops);
-        proc_create("rose_routes", 0444, init_net.proc_net,
-                    &rose_routes_fops);
+        proc_create_seq("rose", 0444, init_net.proc_net, &rose_info_seqops);
+        proc_create_seq("rose_neigh", 0444, init_net.proc_net,
+                    &rose_neigh_seqops);
+        proc_create_seq("rose_nodes", 0444, init_net.proc_net,
+                    &rose_node_seqops);
+        proc_create_seq("rose_routes", 0444, init_net.proc_net,
+                    &rose_route_seqops);
 out:
         return rc;
 fail:
diff --git a/net/rose/rose_route.c b/net/rose/rose_route.c
index 178619ddab68..77e9f85a2c92 100644
--- a/net/rose/rose_route.c
+++ b/net/rose/rose_route.c
@@ -1143,25 +1143,13 @@ static int rose_node_show(struct seq_file *seq, void *v)
         return 0;
 }
 
-static const struct seq_operations rose_node_seqops = {
+const struct seq_operations rose_node_seqops = {
         .start = rose_node_start,
         .next = rose_node_next,
         .stop = rose_node_stop,
         .show = rose_node_show,
 };
 
-static int rose_nodes_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &rose_node_seqops);
-}
-
-const struct file_operations rose_nodes_fops = {
-        .open = rose_nodes_open,
-        .read = seq_read,
-        .llseek = seq_lseek,
-        .release = seq_release,
-};
-
 static void *rose_neigh_start(struct seq_file *seq, loff_t *pos)
         __acquires(rose_neigh_list_lock)
 {
@@ -1226,26 +1214,13 @@ static int rose_neigh_show(struct seq_file *seq, void *v)
 }
 
 
-static const struct seq_operations rose_neigh_seqops = {
+const struct seq_operations rose_neigh_seqops = {
         .start = rose_neigh_start,
         .next = rose_neigh_next,
         .stop = rose_neigh_stop,
         .show = rose_neigh_show,
 };
 
-static int rose_neigh_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &rose_neigh_seqops);
-}
-
-const struct file_operations rose_neigh_fops = {
-        .open = rose_neigh_open,
-        .read = seq_read,
-        .llseek = seq_lseek,
-        .release = seq_release,
-};
-
-
 static void *rose_route_start(struct seq_file *seq, loff_t *pos)
         __acquires(rose_route_list_lock)
 {
@@ -1311,25 +1286,12 @@ static int rose_route_show(struct seq_file *seq, void *v)
         return 0;
 }
 
-static const struct seq_operations rose_route_seqops = {
+struct seq_operations rose_route_seqops = {
         .start = rose_route_start,
         .next = rose_route_next,
         .stop = rose_route_stop,
         .show = rose_route_show,
 };
-
-static int rose_route_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &rose_route_seqops);
-}
-
-const struct file_operations rose_routes_fops = {
-        .open = rose_route_open,
-        .read = seq_read,
-        .llseek = seq_lseek,
-        .release = seq_release,
-};
-
 #endif /* CONFIG_PROC_FS */
 
 /*
diff --git a/net/rxrpc/ar-internal.h b/net/rxrpc/ar-internal.h
index 19975d2ca9a2..29923ec2189c 100644
--- a/net/rxrpc/ar-internal.h
+++ b/net/rxrpc/ar-internal.h
@@ -1051,8 +1051,8 @@ void __rxrpc_queue_peer_error(struct rxrpc_peer *);
 /*
  * proc.c
  */
-extern const struct file_operations rxrpc_call_seq_fops;
-extern const struct file_operations rxrpc_connection_seq_fops;
+extern const struct seq_operations rxrpc_call_seq_ops;
+extern const struct seq_operations rxrpc_connection_seq_ops;
 
 /*
  * recvmsg.c
diff --git a/net/rxrpc/net_ns.c b/net/rxrpc/net_ns.c
index c7a023fb22d0..5d6a773db973 100644
--- a/net/rxrpc/net_ns.c
+++ b/net/rxrpc/net_ns.c
@@ -97,8 +97,11 @@ static __net_init int rxrpc_init_net(struct net *net)
         if (!rxnet->proc_net)
                 goto err_proc;
 
-        proc_create("calls", 0444, rxnet->proc_net, &rxrpc_call_seq_fops);
-        proc_create("conns", 0444, rxnet->proc_net, &rxrpc_connection_seq_fops);
+        proc_create_net("calls", 0444, rxnet->proc_net, &rxrpc_call_seq_ops,
+                        sizeof(struct seq_net_private));
+        proc_create_net("conns", 0444, rxnet->proc_net,
+                        &rxrpc_connection_seq_ops,
+                        sizeof(struct seq_net_private));
         return 0;
 
 err_proc:
diff --git a/net/rxrpc/proc.c b/net/rxrpc/proc.c
index 7e45db058823..d9fca8c4bcdc 100644
--- a/net/rxrpc/proc.c
+++ b/net/rxrpc/proc.c
@@ -115,26 +115,13 @@ static int rxrpc_call_seq_show(struct seq_file *seq, void *v)
         return 0;
 }
 
-static const struct seq_operations rxrpc_call_seq_ops = {
+const struct seq_operations rxrpc_call_seq_ops = {
         .start  = rxrpc_call_seq_start,
         .next   = rxrpc_call_seq_next,
         .stop   = rxrpc_call_seq_stop,
         .show   = rxrpc_call_seq_show,
 };
 
-static int rxrpc_call_seq_open(struct inode *inode, struct file *file)
-{
-        return seq_open_net(inode, file, &rxrpc_call_seq_ops,
-                            sizeof(struct seq_net_private));
-}
-
-const struct file_operations rxrpc_call_seq_fops = {
-        .open           = rxrpc_call_seq_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release,
-};
-
 /*
  * generate a list of extant virtual connections in /proc/net/rxrpc_conns
  */
@@ -207,23 +194,9 @@ print:
         return 0;
 }
 
-static const struct seq_operations rxrpc_connection_seq_ops = {
+const struct seq_operations rxrpc_connection_seq_ops = {
         .start  = rxrpc_connection_seq_start,
         .next   = rxrpc_connection_seq_next,
         .stop   = rxrpc_connection_seq_stop,
         .show   = rxrpc_connection_seq_show,
 };
-
-
-static int rxrpc_connection_seq_open(struct inode *inode, struct file *file)
-{
-        return seq_open_net(inode, file, &rxrpc_connection_seq_ops,
-                            sizeof(struct seq_net_private));
-}
-
-const struct file_operations rxrpc_connection_seq_fops = {
-        .open           = rxrpc_connection_seq_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release,
-};
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
index 106dae7e4818..54eca685420f 100644
--- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c
@@ -2092,23 +2092,11 @@ static int psched_show(struct seq_file *seq, void *v)
         return 0;
 }
 
-static int psched_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, psched_show, NULL);
-}
-
-static const struct file_operations psched_fops = {
-        .open = psched_open,
-        .read  = seq_read,
-        .llseek = seq_lseek,
-        .release = single_release,
-};
-
 static int __net_init psched_net_init(struct net *net)
 {
         struct proc_dir_entry *e;
 
-        e = proc_create("psched", 0, net->proc_net, &psched_fops);
+        e = proc_create_single("psched", 0, net->proc_net, psched_show);
         if (e == NULL)
                 return -ENOMEM;
 
diff --git a/net/sctp/objcnt.c b/net/sctp/objcnt.c
index fd2684ad94c8..a6179b26b80c 100644
--- a/net/sctp/objcnt.c
+++ b/net/sctp/objcnt.c
@@ -108,25 +108,13 @@ static const struct seq_operations sctp_objcnt_seq_ops = {
         .show  = sctp_objcnt_seq_show,
 };
 
-static int sctp_objcnt_seq_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &sctp_objcnt_seq_ops);
-}
-
-static const struct file_operations sctp_objcnt_ops = {
-        .open    = sctp_objcnt_seq_open,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
-        .release = seq_release,
-};
-
 /* Initialize the objcount in the proc filesystem.  */
 void sctp_dbg_objcnt_init(struct net *net)
 {
         struct proc_dir_entry *ent;
 
-        ent = proc_create("sctp_dbg_objcnt", 0,
-                          net->sctp.proc_net_sctp, &sctp_objcnt_ops);
+        ent = proc_create_seq("sctp_dbg_objcnt", 0,
+                          net->sctp.proc_net_sctp, &sctp_objcnt_seq_ops);
         if (!ent)
                 pr_warn("sctp_dbg_objcnt: Unable to create /proc entry.\n");
 }
diff --git a/net/sctp/proc.c b/net/sctp/proc.c
index 1d9ccc6dab2b..ef5c9a82d4e8 100644
--- a/net/sctp/proc.c
+++ b/net/sctp/proc.c
@@ -88,19 +88,6 @@ static int sctp_snmp_seq_show(struct seq_file *seq, void *v)
         return 0;
 }
 
-/* Initialize the seq file operations for 'snmp' object. */
-static int sctp_snmp_seq_open(struct inode *inode, struct file *file)
-{
-        return single_open_net(inode, file, sctp_snmp_seq_show);
-}
-
-static const struct file_operations sctp_snmp_seq_fops = {
-        .open    = sctp_snmp_seq_open,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
-        .release = single_release_net,
-};
-
 /* Dump local addresses of an association/endpoint. */
 static void sctp_seq_dump_local_addrs(struct seq_file *seq, struct sctp_ep_common *epb)
 {
@@ -225,21 +212,6 @@ static const struct seq_operations sctp_eps_ops = {
         .show  = sctp_eps_seq_show,
 };
 
-
-/* Initialize the seq file operations for 'eps' object. */
-static int sctp_eps_seq_open(struct inode *inode, struct file *file)
-{
-        return seq_open_net(inode, file, &sctp_eps_ops,
-                            sizeof(struct seq_net_private));
-}
-
-static const struct file_operations sctp_eps_seq_fops = {
-        .open    = sctp_eps_seq_open,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
-        .release = seq_release_net,
-};
-
 struct sctp_ht_iter {
         struct seq_net_private p;
         struct rhashtable_iter hti;
@@ -338,20 +310,6 @@ static const struct seq_operations sctp_assoc_ops = {
         .show  = sctp_assocs_seq_show,
 };
 
-/* Initialize the seq file operations for 'assocs' object. */
-static int sctp_assocs_seq_open(struct inode *inode, struct file *file)
-{
-        return seq_open_net(inode, file, &sctp_assoc_ops,
-                            sizeof(struct sctp_ht_iter));
-}
-
-static const struct file_operations sctp_assocs_seq_fops = {
-        .open    = sctp_assocs_seq_open,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
-        .release = seq_release_net,
-};
-
 static int sctp_remaddr_seq_show(struct seq_file *seq, void *v)
 {
         struct sctp_association *assoc;
@@ -431,36 +389,23 @@ static const struct seq_operations sctp_remaddr_ops = {
         .show  = sctp_remaddr_seq_show,
 };
 
-static int sctp_remaddr_seq_open(struct inode *inode, struct file *file)
-{
-        return seq_open_net(inode, file, &sctp_remaddr_ops,
-                            sizeof(struct sctp_ht_iter));
-}
-
-static const struct file_operations sctp_remaddr_seq_fops = {
-        .open = sctp_remaddr_seq_open,
-        .read = seq_read,
-        .llseek = seq_lseek,
-        .release = seq_release_net,
-};
-
 /* Set up the proc fs entry for the SCTP protocol. */
 int __net_init sctp_proc_init(struct net *net)
 {
         net->sctp.proc_net_sctp = proc_net_mkdir(net, "sctp", net->proc_net);
         if (!net->sctp.proc_net_sctp)
                 return -ENOMEM;
-        if (!proc_create("snmp", 0444, net->sctp.proc_net_sctp,
-                         &sctp_snmp_seq_fops))
+        if (!proc_create_net_single("snmp", 0444, net->sctp.proc_net_sctp,
+                         sctp_snmp_seq_show, NULL))
                 goto cleanup;
-        if (!proc_create("eps", 0444, net->sctp.proc_net_sctp,
-                         &sctp_eps_seq_fops))
+        if (!proc_create_net("eps", 0444, net->sctp.proc_net_sctp,
+                        &sctp_eps_ops, sizeof(struct seq_net_private)))
                 goto cleanup;
-        if (!proc_create("assocs", 0444, net->sctp.proc_net_sctp,
-                         &sctp_assocs_seq_fops))
+        if (!proc_create_net("assocs", 0444, net->sctp.proc_net_sctp,
+                        &sctp_assoc_ops, sizeof(struct sctp_ht_iter)))
                 goto cleanup;
-        if (!proc_create("remaddr", 0444, net->sctp.proc_net_sctp,
-                         &sctp_remaddr_seq_fops))
+        if (!proc_create_net("remaddr", 0444, net->sctp.proc_net_sctp,
+                        &sctp_remaddr_ops, sizeof(struct sctp_ht_iter)))
                 goto cleanup;
         return 0;
 
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 68bb70a62afe..e5473c03d667 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -2852,20 +2852,6 @@ static const struct seq_operations unix_seq_ops = {
         .stop   = unix_seq_stop,
         .show   = unix_seq_show,
 };
-
-static int unix_seq_open(struct inode *inode, struct file *file)
-{
-        return seq_open_net(inode, file, &unix_seq_ops,
-                            sizeof(struct seq_net_private));
-}
-
-static const struct file_operations unix_seq_fops = {
-        .open           = unix_seq_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release_net,
-};
-
 #endif
 
 static const struct net_proto_family unix_family_ops = {
@@ -2884,7 +2870,8 @@ static int __net_init unix_net_init(struct net *net)
                 goto out;
 
 #ifdef CONFIG_PROC_FS
-        if (!proc_create("unix", 0, net->proc_net, &unix_seq_fops)) {
+        if (!proc_create_net("unix", 0, net->proc_net, &unix_seq_ops,
+                        sizeof(struct seq_net_private))) {
                 unix_sysctl_unregister(net);
                 goto out;
         }
diff --git a/net/wireless/wext-proc.c b/net/wireless/wext-proc.c
index b4c464594a5e..cadcf8613af2 100644
--- a/net/wireless/wext-proc.c
+++ b/net/wireless/wext-proc.c
@@ -126,24 +126,11 @@ static const struct seq_operations wireless_seq_ops = {
         .show  = wireless_dev_seq_show,
 };
 
-static int seq_open_wireless(struct inode *inode, struct file *file)
-{
-        return seq_open_net(inode, file, &wireless_seq_ops,
-                            sizeof(struct seq_net_private));
-}
-
-static const struct file_operations wireless_seq_fops = {
-        .open    = seq_open_wireless,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
-        .release = seq_release_net,
-};
-
 int __net_init wext_proc_init(struct net *net)
 {
         /* Create /proc/net/wireless entry */
-        if (!proc_create("wireless", 0444, net->proc_net,
-                         &wireless_seq_fops))
+        if (!proc_create_net("wireless", 0444, net->proc_net,
+                        &wireless_seq_ops, sizeof(struct seq_net_private)))
                 return -ENOMEM;
 
         return 0;
diff --git a/net/x25/x25_proc.c b/net/x25/x25_proc.c
index 64b415e93f6a..da52c9dc256c 100644
--- a/net/x25/x25_proc.c
+++ b/net/x25/x25_proc.c
@@ -171,57 +171,21 @@ static const struct seq_operations x25_seq_forward_ops = {
         .show   = x25_seq_forward_show,
 };
 
-static int x25_seq_socket_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &x25_seq_socket_ops);
-}
-
-static int x25_seq_route_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &x25_seq_route_ops);
-}
-
-static int x25_seq_forward_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &x25_seq_forward_ops);
-}
-
-static const struct file_operations x25_seq_socket_fops = {
-        .open           = x25_seq_socket_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release,
-};
-
-static const struct file_operations x25_seq_route_fops = {
-        .open           = x25_seq_route_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release,
-};
-
-static const struct file_operations x25_seq_forward_fops = {
-        .open           = x25_seq_forward_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release,
-};
-
 int __init x25_proc_init(void)
 {
         if (!proc_mkdir("x25", init_net.proc_net))
                 return -ENOMEM;
 
-        if (!proc_create("x25/route", 0444, init_net.proc_net,
-                         &x25_seq_route_fops))
+        if (!proc_create_seq("x25/route", 0444, init_net.proc_net,
+                         &x25_seq_route_ops))
                 goto out;
 
-        if (!proc_create("x25/socket", 0444, init_net.proc_net,
-                         &x25_seq_socket_fops))
+        if (!proc_create_seq("x25/socket", 0444, init_net.proc_net,
+                         &x25_seq_socket_ops))
                 goto out;
 
-        if (!proc_create("x25/forward", 0444, init_net.proc_net,
-                         &x25_seq_forward_fops))
+        if (!proc_create_seq("x25/forward", 0444, init_net.proc_net,
+                         &x25_seq_forward_ops))
                 goto out;
         return 0;
 
diff --git a/net/xfrm/xfrm_proc.c b/net/xfrm/xfrm_proc.c
index ed06903cd84d..178318d2e120 100644
--- a/net/xfrm/xfrm_proc.c
+++ b/net/xfrm/xfrm_proc.c
@@ -65,22 +65,10 @@ static int xfrm_statistics_seq_show(struct seq_file *seq, void *v)
         return 0;
 }
 
-static int xfrm_statistics_seq_open(struct inode *inode, struct file *file)
-{
-        return single_open_net(inode, file, xfrm_statistics_seq_show);
-}
-
-static const struct file_operations xfrm_statistics_seq_fops = {
-        .open    = xfrm_statistics_seq_open,
-        .read    = seq_read,
-        .llseek  = seq_lseek,
-        .release = single_release_net,
-};
-
 int __net_init xfrm_proc_init(struct net *net)
 {
-        if (!proc_create("xfrm_stat", 0444, net->proc_net,
-                         &xfrm_statistics_seq_fops))
+        if (!proc_create_net_single("xfrm_stat", 0444, net->proc_net,
+                         xfrm_statistics_seq_show, NULL))
                 return -ENOMEM;
         return 0;
 }
diff --git a/security/keys/proc.c b/security/keys/proc.c
index fbc4af5c6c9f..5af2934965d8 100644
--- a/security/keys/proc.c
+++ b/security/keys/proc.c
@@ -18,7 +18,6 @@
 #include <asm/errno.h>
 #include "internal.h"
 
-static int proc_keys_open(struct inode *inode, struct file *file);
 static void *proc_keys_start(struct seq_file *p, loff_t *_pos);
 static void *proc_keys_next(struct seq_file *p, void *v, loff_t *_pos);
 static void proc_keys_stop(struct seq_file *p, void *v);
@@ -31,14 +30,6 @@ static const struct seq_operations proc_keys_ops = {
         .show   = proc_keys_show,
 };
 
-static const struct file_operations proc_keys_fops = {
-        .open           = proc_keys_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release,
-};
-
-static int proc_key_users_open(struct inode *inode, struct file *file);
 static void *proc_key_users_start(struct seq_file *p, loff_t *_pos);
 static void *proc_key_users_next(struct seq_file *p, void *v, loff_t *_pos);
 static void proc_key_users_stop(struct seq_file *p, void *v);
@@ -51,13 +42,6 @@ static const struct seq_operations proc_key_users_ops = {
         .show   = proc_key_users_show,
 };
 
-static const struct file_operations proc_key_users_fops = {
-        .open           = proc_key_users_open,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = seq_release,
-};
-
 /*
  * Declare the /proc files.
  */
@@ -65,11 +49,11 @@ static int __init key_proc_init(void)
 {
         struct proc_dir_entry *p;
 
-        p = proc_create("keys", 0, NULL, &proc_keys_fops);
+        p = proc_create_seq("keys", 0, NULL, &proc_keys_ops);
         if (!p)
                 panic("Cannot create /proc/keys\n");
 
-        p = proc_create("key-users", 0, NULL, &proc_key_users_fops);
+        p = proc_create_seq("key-users", 0, NULL, &proc_key_users_ops);
         if (!p)
                 panic("Cannot create /proc/key-users\n");
 
@@ -96,11 +80,6 @@ static struct rb_node *key_serial_next(struct seq_file *p, struct rb_node *n)
         return n;
 }
 
-static int proc_keys_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &proc_keys_ops);
-}
-
 static struct key *find_ge_key(struct seq_file *p, key_serial_t id)
 {
         struct user_namespace *user_ns = seq_user_ns(p);
@@ -293,15 +272,6 @@ static struct rb_node *key_user_first(struct user_namespace *user_ns, struct rb_
         return __key_user_next(user_ns, n);
 }
 
-/*
- * Implement "/proc/key-users" to provides a list of the key users and their
- * quotas.
- */
-static int proc_key_users_open(struct inode *inode, struct file *file)
-{
-        return seq_open(file, &proc_key_users_ops);
-}
-
 static void *proc_key_users_start(struct seq_file *p, loff_t *_pos)
         __acquires(key_user_lock)
 {