Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e784788d authored by Al Viro's avatar Al Viro
Browse files

get rid of a bunch of open-coded create_proc_read_entry() 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 96e7d915

arch/arm/kernel/swp_emulate.c

+2 −3
Original line number Diff line number Diff line
@@ -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");

arch/cris/arch-v10/kernel/fasttimer.c

+1 −3
Original line number Diff line number Diff line
@@ -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))

arch/cris/arch-v32/kernel/fasttimer.c

+1 −4
Original line number Diff line number Diff line
@@ -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,

arch/h8300/kernel/gpio.c

+2 −3
Original line number Diff line number Diff line
@@ -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;

}

drivers/char/ds1620.c

+3 −4
Original line number Diff line number Diff line
@@ -397,10 +397,9 @@ static int __init ds1620_init(void) 
		return ret;



#ifdef THERM_USE_PROC

	proc_therm_ds1620 = create_proc_entry("therm", 0, NULL);

	if (proc_therm_ds1620)

		proc_therm_ds1620->read_proc = proc_therm_ds1620_read;

	else

	proc_therm_ds1620 = create_proc_read_entry("therm", 0, NULL,

					proc_therm_ds1620_read, NULL);

	if (!proc_therm_ds1620)

		printk(KERN_ERR "therm: unable to register /proc/therm\n");

#endif