Variants of proc_create{,_data} that directly take a struct seq_operations
argument and drastically reduces the boilerplate code in the callers.
All trivial callers converted over.
Signed-off-by: Christoph Hellwig
---
arch/ia64/hp/common/sba_iommu.c | 15 +-
arch/ia64/kernel/perfmon.c | 16 +--
arch/s390/kernel/sysinfo.c | 14 +-
block/genhd.c| 28 +--
crypto/proc.c| 14 +-
drivers/char/misc.c | 15 +-
drivers/isdn/capi/kcapi_proc.c | 80 ++--
drivers/net/hamradio/bpqether.c | 16 +--
drivers/net/hamradio/scc.c | 17 +--
drivers/net/hamradio/yam.c | 16 +--
drivers/pci/proc.c | 17 +--
drivers/s390/block/dasd_proc.c | 17 +--
drivers/s390/char/tape_proc.c| 19 +---
drivers/staging/ipx/ipx_proc.c | 45 ++
drivers/tty/tty_ldisc.c | 15 +-
drivers/video/fbdev/core/fbmem.c | 15 +-
drivers/zorro/proc.c | 17 +--
fs/cachefiles/proc.c | 19 +---
fs/fscache/histogram.c | 17 +--
fs/fscache/internal.h| 3 +-
fs/fscache/proc.c| 4 +-
fs/proc/consoles.c | 14 +-
fs/proc/devices.c| 14 +-
fs/proc/generic.c| 28 +++
fs/proc/internal.h | 1 +
fs/proc/interrupts.c | 14 +-
fs/proc/nommu.c | 14 +-
fs/proc/proc_tty.c | 16 +--
include/linux/proc_fs.h | 9
include/linux/tty.h | 3 +-
include/net/ax25.h | 5 +-
include/net/netrom.h | 5 +-
include/net/rose.h | 6 +--
kernel/locking/lockdep_proc.c| 29 +---
kernel/sched/debug.c | 28 +--
kernel/sched/stats.c | 15 +-
mm/vmalloc.c | 11 +++--
mm/vmstat.c | 56 ++
net/appletalk/atalk_proc.c | 48 +++
net/atm/br2684.c | 14 +-
net/ax25/af_ax25.c | 21 ++---
net/ax25/ax25_route.c| 15 +-
net/ax25/ax25_uid.c | 15 +-
net/core/net-procfs.c| 16 +--
net/decnet/dn_dev.c | 15 +-
net/llc/llc_proc.c | 28 +--
net/netrom/af_netrom.c | 18 ++-
net/netrom/nr_route.c| 29 +---
net/rose/af_rose.c | 26 +++
net/rose/rose_route.c| 44 ++
net/sctp/objcnt.c| 16 +--
net/x25/x25_proc.c | 48 +++
security/keys/proc.c | 34 +-
53 files changed, 149 insertions(+), 925 deletions(-)
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/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 @@ pfm_probe_pmu(void)
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