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
  ...

1 files changed, 2 insertions, 31 deletions

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)