diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2013-03-30 21:26:37 +0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-04-09 22:13:10 +0400 |
| commit | e784788ddb7000dbea8bd2986a3f83c4d77f96ff (patch) | |
| tree | b542d12760edac644ae39f0f3c6cef0f49882eff /arch | |
| parent | 96e7d9158f5ae91accb9c81cca14bcd0c996c0cc (diff) | |
| download | linux-e784788ddb7000dbea8bd2986a3f83c4d77f96ff.tar.xz | |
get rid of a bunch of open-coded create_proc_read_entry()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/kernel/swp_emulate.c | 5 | ||||
| -rw-r--r-- | arch/cris/arch-v10/kernel/fasttimer.c | 4 | ||||
| -rw-r--r-- | arch/cris/arch-v32/kernel/fasttimer.c | 5 | ||||
| -rw-r--r-- | arch/h8300/kernel/gpio.c | 5 |
4 files changed, 6 insertions, 13 deletions
diff --git a/arch/arm/kernel/swp_emulate.c b/arch/arm/kernel/swp_emulate.c index ab1017bd1667..0bba47ada5bd 100644 --- a/arch/arm/kernel/swp_emulate.c +++ b/arch/arm/kernel/swp_emulate.c @@ -268,12 +268,11 @@ static int __init swp_emulation_init(void) #ifdef CONFIG_PROC_FS struct proc_dir_entry *res; - res = create_proc_entry("cpu/swp_emulation", S_IRUGO, NULL); + res = create_proc_read_entry("cpu/swp_emulation", S_IRUGO, NULL, + proc_read_status, NULL); if (!res) return -ENOMEM; - - res->read_proc = proc_read_status; #endif /* CONFIG_PROC_FS */ printk(KERN_NOTICE "Registering SWP/SWPB emulation handler\n"); diff --git a/arch/cris/arch-v10/kernel/fasttimer.c b/arch/cris/arch-v10/kernel/fasttimer.c index 082f1890bacb..52bb9b5531e1 100644 --- a/arch/cris/arch-v10/kernel/fasttimer.c +++ b/arch/cris/arch-v10/kernel/fasttimer.c @@ -491,7 +491,6 @@ void schedule_usleep(unsigned long us) #ifdef CONFIG_PROC_FS static int proc_fasttimer_read(char *buf, char **start, off_t offset, int len ,int *eof, void *data_unused); -static struct proc_dir_entry *fasttimer_proc_entry; #endif /* CONFIG_PROC_FS */ #ifdef CONFIG_PROC_FS @@ -857,8 +856,7 @@ int fast_timer_init(void) } #endif #ifdef CONFIG_PROC_FS - if ((fasttimer_proc_entry = create_proc_entry( "fasttimer", 0, 0 ))) - fasttimer_proc_entry->read_proc = proc_fasttimer_read; + create_proc_read_entry("fasttimer", 0, NULL, proc_fasttimer_read, NULL); #endif /* PROC_FS */ if(request_irq(TIMER1_IRQ_NBR, timer1_handler, 0, "fast timer int", NULL)) diff --git a/arch/cris/arch-v32/kernel/fasttimer.c b/arch/cris/arch-v32/kernel/fasttimer.c index ab1551ee43c5..dd1c998070e9 100644 --- a/arch/cris/arch-v32/kernel/fasttimer.c +++ b/arch/cris/arch-v32/kernel/fasttimer.c @@ -465,7 +465,6 @@ void schedule_usleep(unsigned long us) #ifdef CONFIG_PROC_FS static int proc_fasttimer_read(char *buf, char **start, off_t offset, int len ,int *eof, void *data_unused); -static struct proc_dir_entry *fasttimer_proc_entry; #endif /* CONFIG_PROC_FS */ #ifdef CONFIG_PROC_FS @@ -816,9 +815,7 @@ int fast_timer_init(void) printk("fast_timer_init()\n"); #ifdef CONFIG_PROC_FS - fasttimer_proc_entry = create_proc_entry("fasttimer", 0, 0); - if (fasttimer_proc_entry) - fasttimer_proc_entry->read_proc = proc_fasttimer_read; + create_proc_read_entry("fasttimer", 0, NULL, proc_fasttimer_read, NULL); #endif /* PROC_FS */ if (request_irq(TIMER0_INTR_VECT, timer_trig_interrupt, IRQF_SHARED | IRQF_DISABLED, diff --git a/arch/h8300/kernel/gpio.c b/arch/h8300/kernel/gpio.c index 6a25dd5530e7..f8a4f5b52697 100644 --- a/arch/h8300/kernel/gpio.c +++ b/arch/h8300/kernel/gpio.c @@ -158,9 +158,8 @@ static __init int register_proc(void) { struct proc_dir_entry *proc_gpio; - proc_gpio = create_proc_entry("gpio", S_IRUGO, NULL); - if (proc_gpio) - proc_gpio->read_proc = gpio_proc_read; + proc_gpio = create_proc_read_entry("gpio", S_IRUGO, NULL, + gpio_proc_read, NULL); return proc_gpio != NULL; } |