From mboxrd@z Thu Jan 1 00:00:00 1970 Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 28 Aug 2006 09:53:06 +0100 (BST) Received: from caramon.arm.linux.org.uk ([217.147.92.249]:19985 "EHLO caramon.arm.linux.org.uk") by ftp.linux-mips.org with ESMTP id S20038473AbWH1IxE (ORCPT ); Mon, 28 Aug 2006 09:53:04 +0100 Received: from flint.arm.linux.org.uk ([2002:d993:5cf9:1:201:2ff:fe14:8fad]) by caramon.arm.linux.org.uk with esmtpsa (TLSv1:DES-CBC3-SHA:168) (Exim 4.52) id 1GHcrP-000100-Ge; Mon, 28 Aug 2006 09:52:48 +0100 Received: from rmk by flint.arm.linux.org.uk with local (Exim 4.52) id 1GHcrN-0003k0-53; Mon, 28 Aug 2006 09:52:45 +0100 Date: Mon, 28 Aug 2006 09:52:44 +0100 From: Russell King To: linux-ia64@vger.kernel.org, linux-mips@linux-mips.org, linuxppc-embedded@ozlabs.org, paulkf@microgate.com, takata@linux-m32r.org, linux-kernel@vger.kernel.org Subject: [CFT:PATCH] Removing possible wrong asm/serial.h inclusions Message-ID: <20060828085244.GA13544@flint.arm.linux.org.uk> Mail-Followup-To: linux-ia64@vger.kernel.org, linux-mips@linux-mips.org, linuxppc-embedded@ozlabs.org, paulkf@microgate.com, takata@linux-m32r.org, linux-kernel@vger.kernel.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.4.1i Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 12448 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: rmk+lkml@arm.linux.org.uk Precedence: bulk X-list: linux-mips asm/serial.h is supposed to contain the definitions for the architecture specific 8250 ports for the 8250 driver. It may also define BASE_BAUD, but this is the base baud for the architecture specific ports _only_. Therefore, nothing other than the 8250 driver should be including this header file. In order to move towards this goal, here is a patch which removes some of the more obvious incorrect includes of the file. MIPS and PPC has rather a lot of stuff in asm/serial.h, some of it looks related to non-8250 ports. Hence, it's not trivial to conclude that these includes are indeed unnecessary, so can mips and ppc people please test this patch carefully. Thanks. diff --git a/arch/frv/kernel/setup.c b/arch/frv/kernel/setup.c --- a/arch/frv/kernel/setup.c +++ b/arch/frv/kernel/setup.c @@ -31,7 +31,6 @@ #include #include -#include #include #include #include diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c --- a/arch/ia64/kernel/setup.c +++ b/arch/ia64/kernel/setup.c @@ -54,7 +54,6 @@ #include #include #include -#include #include #include #include diff --git a/arch/mips/cobalt/setup.c b/arch/mips/cobalt/setup.c --- a/arch/mips/cobalt/setup.c +++ b/arch/mips/cobalt/setup.c @@ -23,7 +23,6 @@ #include #include #include -#include #include diff --git a/arch/mips/lasat/setup.c b/arch/mips/lasat/setup.c --- a/arch/mips/lasat/setup.c +++ b/arch/mips/lasat/setup.c @@ -34,7 +34,6 @@ #include #include #include -#include #include #include diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c --- a/arch/powerpc/kernel/setup-common.c +++ b/arch/powerpc/kernel/setup-common.c @@ -51,7 +51,6 @@ #include #include #include -#include #include #include #include diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c --- a/arch/powerpc/kernel/setup_32.c +++ b/arch/powerpc/kernel/setup_32.c @@ -38,7 +38,6 @@ #include #include #include -#include #include #include "setup.h" diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c --- a/arch/powerpc/kernel/setup_64.c +++ b/arch/powerpc/kernel/setup_64.c @@ -51,7 +51,6 @@ #include #include #include -#include #include #include #include diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c --- a/drivers/char/pcmcia/synclink_cs.c +++ b/drivers/char/pcmcia/synclink_cs.c @@ -57,7 +57,6 @@ #include #include #include -#include #include #include diff --git a/drivers/char/synclink.c b/drivers/char/synclink.c --- a/drivers/char/synclink.c +++ b/drivers/char/synclink.c @@ -87,7 +87,6 @@ #include #include -#include #include #include diff --git a/drivers/serial/m32r_sio.c b/drivers/serial/m32r_sio.c --- a/drivers/serial/m32r_sio.c +++ b/drivers/serial/m32r_sio.c @@ -76,17 +76,16 @@ */ #define is_real_interrupt(irq) ((irq) != 0) -#include +#define BASE_BAUD 115200 /* Standard COM flags */ #define STD_COM_FLAGS (UPF_BOOT_AUTOCONF | UPF_SKIP_TEST) /* * SERIAL_PORT_DFNS tells us about built-in ports that have no * standard enumeration mechanism. Platforms that can find all * serial ports via mechanisms like ACPI or PCI need not supply it. */ -#undef SERIAL_PORT_DFNS #if defined(CONFIG_PLAT_USRV) #define SERIAL_PORT_DFNS \ @@ -109,7 +108,7 @@ #endif /* !CONFIG_PLAT_USRV */ static struct old_serial_port old_serial_port[] = { - SERIAL_PORT_DFNS /* defined in asm/serial.h */ + SERIAL_PORT_DFNS }; #define UART_NR ARRAY_SIZE(old_serial_port) -- Russell King Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/ maintainer of: 2.6 Serial core