diff options
-rw-r--r-- | arch/cris/arch-v32/kernel/fasttimer.c | 30 |
1 files changed, 2 insertions, 28 deletions
diff --git a/arch/cris/arch-v32/kernel/fasttimer.c b/arch/cris/arch-v32/kernel/fasttimer.c index 5daeb6f7f3b..79e1e4c2ca1 100644 --- a/arch/cris/arch-v32/kernel/fasttimer.c +++ b/arch/cris/arch-v32/kernel/fasttimer.c | |||
@@ -603,23 +603,8 @@ void schedule_usleep(unsigned long us) | |||
603 | 603 | ||
604 | #ifdef CONFIG_PROC_FS | 604 | #ifdef CONFIG_PROC_FS |
605 | static int proc_fasttimer_read(char *buf, char **start, off_t offset, int len | 605 | static int proc_fasttimer_read(char *buf, char **start, off_t offset, int len |
606 | #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,2,0) | 606 | ,int *eof, void *data_unused); |
607 | ,int *eof, void *data_unused | ||
608 | #else | ||
609 | ,int unused | ||
610 | #endif | ||
611 | ); | ||
612 | #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,2,0) | ||
613 | static struct proc_dir_entry *fasttimer_proc_entry; | 607 | static struct proc_dir_entry *fasttimer_proc_entry; |
614 | #else | ||
615 | static struct proc_dir_entry fasttimer_proc_entry = | ||
616 | { | ||
617 | 0, 9, "fasttimer", | ||
618 | S_IFREG | S_IRUGO, 1, 0, 0, | ||
619 | 0, NULL /* ops -- default to array */, | ||
620 | &proc_fasttimer_read /* get_info */, | ||
621 | }; | ||
622 | #endif | ||
623 | #endif /* CONFIG_PROC_FS */ | 608 | #endif /* CONFIG_PROC_FS */ |
624 | 609 | ||
625 | #ifdef CONFIG_PROC_FS | 610 | #ifdef CONFIG_PROC_FS |
@@ -628,12 +613,7 @@ static struct proc_dir_entry fasttimer_proc_entry = | |||
628 | #define BIG_BUF_SIZE (500 + NUM_TIMER_STATS * 300) | 613 | #define BIG_BUF_SIZE (500 + NUM_TIMER_STATS * 300) |
629 | 614 | ||
630 | static int proc_fasttimer_read(char *buf, char **start, off_t offset, int len | 615 | static int proc_fasttimer_read(char *buf, char **start, off_t offset, int len |
631 | #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,2,0) | 616 | ,int *eof, void *data_unused) |
632 | ,int *eof, void *data_unused | ||
633 | #else | ||
634 | ,int unused | ||
635 | #endif | ||
636 | ) | ||
637 | { | 617 | { |
638 | unsigned long flags; | 618 | unsigned long flags; |
639 | int i = 0; | 619 | int i = 0; |
@@ -808,9 +788,7 @@ static int proc_fasttimer_read(char *buf, char **start, off_t offset, int len | |||
808 | 788 | ||
809 | memcpy(buf, bigbuf + offset, len); | 789 | memcpy(buf, bigbuf + offset, len); |
810 | *start = buf; | 790 | *start = buf; |
811 | #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,2,0) | ||
812 | *eof = 1; | 791 | *eof = 1; |
813 | #endif | ||
814 | 792 | ||
815 | return len; | 793 | return len; |
816 | } | 794 | } |
@@ -974,12 +952,8 @@ void fast_timer_init(void) | |||
974 | printk("fast_timer_init()\n"); | 952 | printk("fast_timer_init()\n"); |
975 | 953 | ||
976 | #ifdef CONFIG_PROC_FS | 954 | #ifdef CONFIG_PROC_FS |
977 | #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,2,0) | ||
978 | if ((fasttimer_proc_entry = create_proc_entry( "fasttimer", 0, 0 ))) | 955 | if ((fasttimer_proc_entry = create_proc_entry( "fasttimer", 0, 0 ))) |
979 | fasttimer_proc_entry->read_proc = proc_fasttimer_read; | 956 | fasttimer_proc_entry->read_proc = proc_fasttimer_read; |
980 | #else | ||
981 | proc_register_dynamic(&proc_root, &fasttimer_proc_entry); | ||
982 | #endif | ||
983 | #endif /* PROC_FS */ | 957 | #endif /* PROC_FS */ |
984 | if(request_irq(TIMER_INTR_VECT, timer_trig_interrupt, IRQF_DISABLED, | 958 | if(request_irq(TIMER_INTR_VECT, timer_trig_interrupt, IRQF_DISABLED, |
985 | "fast timer int", NULL)) | 959 | "fast timer int", NULL)) |