From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933546AbXCZEI0 (ORCPT ); Mon, 26 Mar 2007 00:08:26 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S933549AbXCZEI0 (ORCPT ); Mon, 26 Mar 2007 00:08:26 -0400 Received: from mailout.stusta.mhn.de ([141.84.69.5]:34515 "EHLO mailhub.stusta.mhn.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S933546AbXCZEIZ (ORCPT ); Mon, 26 Mar 2007 00:08:25 -0400 Date: Mon, 26 Mar 2007 06:08:29 +0200 From: Adrian Bunk To: starvik@axis.com Cc: dev-etrax@axis.com, linux-kernel@vger.kernel.org Subject: [2.6 patch] arch/cris/arch-v32/kernel/fasttimer.c: remove kernel 2.0 code Message-ID: <20070326040829.GW16477@stusta.de> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline User-Agent: Mutt/1.5.13 (2006-08-11) Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org This patch removes code for kernel 2.0 (sic). Signed-off-by: Adrian Bunk --- 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))