LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [2.6 patch] arch/cris/arch-v32/kernel/fasttimer.c: remove kernel 2.0 code
@ 2007-03-26  4:08 Adrian Bunk
  0 siblings, 0 replies; 2+ messages in thread
From: Adrian Bunk @ 2007-03-26  4:08 UTC (permalink / raw)
  To: starvik; +Cc: dev-etrax, linux-kernel

This patch removes code for kernel 2.0 (sic).

Signed-off-by: Adrian Bunk <bunk@stusta.de>

---

 arch/cris/arch-v32/kernel/fasttimer.c |   36 ++------------------------
 1 file changed, 3 insertions(+), 33 deletions(-)

--- linux-2.6.21-rc4-mm1/arch/cris/arch-v32/kernel/fasttimer.c.old	2007-03-25 19:50:26.000000000 +0200
+++ linux-2.6.21-rc4-mm1/arch/cris/arch-v32/kernel/fasttimer.c	2007-03-25 19:52:36.000000000 +0200
@@ -602,38 +602,14 @@
 }
 
 #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)
-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
+static struct proc_dir_entry *fasttimer_proc_entry;
 
 /* This value is very much based on testing */
 #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
-                               )
+static int proc_fasttimer_read(char *buf, char **start, off_t offset, int len,
+			       int *eof, void *data_unused)
 {
   unsigned long flags;
   int i = 0;
@@ -808,9 +784,7 @@
 
   memcpy(buf, bigbuf + offset, len);
   *start = buf;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,2,0)
   *eof = 1;
-#endif
 
   return len;
 }
@@ -974,12 +948,8 @@
     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))


^ permalink raw reply	[flat|nested] 2+ messages in thread

* RE: [2.6 patch] arch/cris/arch-v32/kernel/fasttimer.c: remove kernel 2.0 code
       [not found] <BFECAF9E178F144FAEF2BF4CE739C66804778EF5@exmail1.se.axis.com>
@ 2007-03-26  5:41 ` Mikael Starvik
  0 siblings, 0 replies; 2+ messages in thread
From: Mikael Starvik @ 2007-03-26  5:41 UTC (permalink / raw)
  To: 'Adrian Bunk', Mikael Starvik; +Cc: dev-etrax, linux-kernel

Yes, I agree totally. 

Signed-off-by: Mikael Starvik <starvik@axis.com>

-----Original Message-----
From: Adrian Bunk [mailto:bunk@stusta.de] 
Sent: Monday, March 26, 2007 6:08 AM
To: Mikael Starvik
Cc: dev-etrax; linux-kernel@vger.kernel.org
Subject: [2.6 patch] arch/cris/arch-v32/kernel/fasttimer.c: remove kernel
2.0 code


This patch removes code for kernel 2.0 (sic).

Signed-off-by: Adrian Bunk <bunk@stusta.de>

---

 arch/cris/arch-v32/kernel/fasttimer.c |   36 ++------------------------
 1 file changed, 3 insertions(+), 33 deletions(-)

--- linux-2.6.21-rc4-mm1/arch/cris/arch-v32/kernel/fasttimer.c.old
2007-03-25 19:50:26.000000000 +0200
+++ linux-2.6.21-rc4-mm1/arch/cris/arch-v32/kernel/fasttimer.c	2007-03-25
19:52:36.000000000 +0200
@@ -602,38 +602,14 @@
 }
 
 #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)
-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
+static struct proc_dir_entry *fasttimer_proc_entry;
 
 /* This value is very much based on testing */
 #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
-                               )
+static int proc_fasttimer_read(char *buf, char **start, off_t offset, int
len,
+			       int *eof, void *data_unused)
 {
   unsigned long flags;
   int i = 0;
@@ -808,9 +784,7 @@
 
   memcpy(buf, bigbuf + offset, len);
   *start = buf;
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,2,0)
   *eof = 1;
-#endif
 
   return len;
 }
@@ -974,12 +948,8 @@
     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))


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2007-03-26  5:47 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-03-26  4:08 [2.6 patch] arch/cris/arch-v32/kernel/fasttimer.c: remove kernel 2.0 code Adrian Bunk
     [not found] <BFECAF9E178F144FAEF2BF4CE739C66804778EF5@exmail1.se.axis.com>
2007-03-26  5:41 ` Mikael Starvik

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).