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

Commit 7a3e965a authored by Robert P. J. Day's avatar Robert P. J. Day Committed by Linus Torvalds
Browse files

CRIS: remove code related to pre-2.2 kernel 



Remove conditionals and code related to checking for a pre-2.2 kernel.

Signed-off-by: default avatarRobert P. J. Day <rpjday@mindspring.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 542401d9

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

+2 −28
Original line number Diff line number Diff line
@@ -603,23 +603,8 @@ void schedule_usleep(unsigned long us) 


#ifdef CONFIG_PROC_FS

static int proc_fasttimer_read(char *buf, char **start, off_t offset, int len

#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,2,0)

                       ,int *eof, void *data_unused

#else

                        ,int unused

#endif

                               );

#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,2,0)

                       ,int *eof, void *data_unused);

static struct proc_dir_entry *fasttimer_proc_entry;

#else

static struct proc_dir_entry fasttimer_proc_entry =

{

  0, 9, "fasttimer",

  S_IFREG | S_IRUGO, 1, 0, 0,

  0, NULL /* ops -- default to array */,

  &proc_fasttimer_read /* get_info */,

};

#endif

#endif /* CONFIG_PROC_FS */



#ifdef CONFIG_PROC_FS
@@ -628,12 +613,7 @@ static struct proc_dir_entry fasttimer_proc_entry = 
#define BIG_BUF_SIZE (500 + NUM_TIMER_STATS * 300)



static int proc_fasttimer_read(char *buf, char **start, off_t offset, int len

#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,2,0)

                       ,int *eof, void *data_unused

#else

                        ,int unused

#endif

                               )

                       ,int *eof, void *data_unused)

{

  unsigned long flags;

  int i = 0;
@@ -808,9 +788,7 @@ static int proc_fasttimer_read(char *buf, char **start, off_t offset, int len 


  memcpy(buf, bigbuf + offset, len);

  *start = buf;

#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,2,0)

  *eof = 1;

#endif



  return len;

}
@@ -974,12 +952,8 @@ void fast_timer_init(void) 
    printk("fast_timer_init()\n");



#ifdef CONFIG_PROC_FS

#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,2,0)

   if ((fasttimer_proc_entry = create_proc_entry( "fasttimer", 0, 0 )))

     fasttimer_proc_entry->read_proc = proc_fasttimer_read;

#else

    proc_register_dynamic(&proc_root, &fasttimer_proc_entry);

#endif

#endif /* PROC_FS */

    if(request_irq(TIMER_INTR_VECT, timer_trig_interrupt, IRQF_DISABLED,

                   "fast timer int", NULL))