From patchwork Mon Aug 27 22:16:35 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haojian Zhuang X-Patchwork-Id: 1378541 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id ACC42DF280 for ; Mon, 27 Aug 2012 22:19:16 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1T67bt-0005rW-M0; Mon, 27 Aug 2012 22:16:41 +0000 Received: from mail-bk0-f49.google.com ([209.85.214.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1T67bp-0005qB-Sk for linux-arm-kernel@lists.infradead.org; Mon, 27 Aug 2012 22:16:38 +0000 Received: by bkcji2 with SMTP id ji2so1487571bkc.36 for ; Mon, 27 Aug 2012 15:16:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=327BVlFG4WNBdvjNI+T3DUekmEPfen27efRTSzVLcqM=; b=srAo/M92Kg7z/n0lti2IO3ZZikSU/hm4+rh3qI9yGHcsem0cHvOw7CG26TunRPFSCY orfuYaQA3hE/Ee59n7t4mKQpGOCcjtLVIMH6IVOkruK8k0rcc+Z1jqQs7XuUzeN+N8f4 AlH1VtQoGrFwESn75i5VLLP2WLvDSbdv4uq6KqSyu9PK/rEMOfuoiYXtlnxUnuKt2sok Ok9DyY9gilM2DsBbKV38AaB0TB4vtWqR/pfyf+bgWxz671GChYKs5AciWx0WY7KEbBZg u8mfiwWBY0xZN5+zmCy3ki0Iggd1Qb/qQ0CaYL5BQS0pVrp9SfpK85vmeY03TuwGMLDO SutQ== MIME-Version: 1.0 Received: by 10.204.152.136 with SMTP id g8mr4196485bkw.44.1346105795670; Mon, 27 Aug 2012 15:16:35 -0700 (PDT) Received: by 10.204.167.72 with HTTP; Mon, 27 Aug 2012 15:16:35 -0700 (PDT) In-Reply-To: <201208221301.19439.arnd@arndb.de> References: <201208221253.07278.arnd@arndb.de> <201208221301.19439.arnd@arndb.de> Date: Tue, 28 Aug 2012 06:16:35 +0800 Message-ID: Subject: Re: [PATCH 4/4] [RFC] ARM: treewide: manually change more mach-*/*.h includes From: Haojian Zhuang To: Arnd Bergmann X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (haojian.zhuang[at]gmail.com) -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.214.49 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: linaro-kernel@lists.linaro.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org On Wed, Aug 22, 2012 at 9:01 PM, Arnd Bergmann wrote: > These are lots of device drivers that include machine > specific header files from ARM platforms and that are > not easily scriptable. The changes have been found through > manual inspection and should cause no visible changes > because of the build script that maps the old names to the > new ones. > Here's the potential issues. arch/arm/include/asm/irq.h: #ifndef CONFIG_SPARSE_IRQ #include #else #define NR_IRQS NR_IRQS_LEGACY #endif arch/arm/include/asm/io.h: #ifdef CONFIG_NEED_MACH_IO_H #include #else #define __io(a) __typesafe_io((a) & IO_SPACE_LIMIT) #endif And you also need the code in below. diff --git a/drivers/gpio/gpio-sa1100.c b/drivers/gpio/gpio-sa1100.c index 8ea3b33..0258c06 100644 --- a/drivers/gpio/gpio-sa1100.c +++ b/drivers/gpio/gpio-sa1100.c @@ -11,8 +11,8 @@ #include #include -#include -#include +#include +#include static int sa1100_gpio_get(struct gpio_chip *chip, unsigned offset) { diff --git a/drivers/input/keyboard/pxa27x_keypad.c b/drivers/input/keyboard/pxa27x_keypad.c index b2e642a..d4b1e80 100644 --- a/drivers/input/keyboard/pxa27x_keypad.c +++ b/drivers/input/keyboard/pxa27x_keypad.c @@ -31,7 +31,14 @@ #include #include -#include +#ifdef CONFIG_ARCH_PXA +#include +#endif + +#ifdef CONFIG_ARCH_MMP +#include +#endif + #include /* * Keypad Controller registers diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c index d6683b7..f83d5ce 100644 --- a/drivers/mtd/nand/pxa3xx_nand.c +++ b/drivers/mtd/nand/pxa3xx_nand.c @@ -23,7 +23,7 @@ #include #include -#include +#include #include #define CHIP_DELAY_TIMEOUT (2 * HZ/10) diff --git a/drivers/pcmcia/pxa2xx_sharpsl.c b/drivers/pcmcia/pxa2xx_sharpsl.c index b066273..77264ba 100644 --- a/drivers/pcmcia/pxa2xx_sharpsl.c +++ b/drivers/pcmcia/pxa2xx_sharpsl.c @@ -19,9 +19,9 @@ #include #include -#include #include #include +#include #include "soc_common.h" diff --git a/drivers/pcmcia/sa1111_generic.c b/drivers/pcmcia/sa1111_generic.c index 70f728c..ebfd5eb 100644 --- a/drivers/pcmcia/sa1111_generic.c +++ b/drivers/pcmcia/sa1111_generic.c @@ -16,7 +16,7 @@ #include -#include +#include #include #include diff --git a/drivers/rtc/rtc-sa1100.c b/drivers/rtc/rtc-sa1100.c index 50a5c4a..812f39c 100644 --- a/drivers/rtc/rtc-sa1100.c +++ b/drivers/rtc/rtc-sa1100.c @@ -35,11 +35,21 @@ #include #include -#include -#include +#ifdef CONFIG_ARCH_MMP +#include +#include +#include +#endif + +#ifdef CONFIG_ARCH_PXA +#include +#include +#include +#endif -#if defined(CONFIG_ARCH_PXA) || defined(CONFIG_ARCH_MMP) -#include +#ifdef CONFIG_ARCH_SA1100 +#include +#include #endif #define RTC_DEF_DIVIDER (32768 - 1) diff --git a/drivers/watchdog/sa1100_wdt.c b/drivers/watchdog/sa1100_wdt.c index ccd6b29..3579d90 100644 --- a/drivers/watchdog/sa1100_wdt.c +++ b/drivers/watchdog/sa1100_wdt.c @@ -34,11 +34,15 @@ #include #ifdef CONFIG_ARCH_PXA -#include +#include +#include +#include #endif -#include -#include +#ifdef CONFIG_ARCH_SA1100 +#include +#include +#endif static unsigned long oscr_freq; static unsigned long sa1100wdt_users;