From patchwork Wed Mar 21 02:15:49 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 147894 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail-gx0-f184.google.com (mail-gx0-f184.google.com [209.85.161.184]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 0AC03B6F13 for ; Wed, 21 Mar 2012 13:16:23 +1100 (EST) Received: by ggnf4 with SMTP id f4sf671125ggn.11 for ; Tue, 20 Mar 2012 19:16:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=beta; h=mime-version:x-beenthere:received-spf:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references:x-original-sender :x-original-authentication-results:reply-to:precedence:mailing-list :list-id:x-google-group-id:list-post:list-help:list-archive:sender :list-subscribe:list-unsubscribe:content-type; bh=hurren+ZZlUNOkOj9HrVVmQYH0fNKtJ81Qs7NpgVk+Q=; b=xvWalkS2NwLsN33GinrmtAXjp9h+LpCNl0YstJPRRhBHwULbjmLEJHBkf5FCP62mOE zNRc79wd/tQtFJ69kkFq9NejKtLO+/4wPYcJiNy13fPcS8z8YxlWEwNbqTuseMWxfrjU VboHiA8l+7GnmJ5ZxPvXdrn8GvKuJmHs9srlM= Received: by 10.50.217.164 with SMTP id oz4mr613301igc.2.1332296179139; Tue, 20 Mar 2012 19:16:19 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: rtc-linux@googlegroups.com Received: by 10.50.114.65 with SMTP id je1ls746636igb.1.gmail; Tue, 20 Mar 2012 19:16:18 -0700 (PDT) Received: by 10.50.154.231 with SMTP id vr7mr7811282igb.2.1332296178766; Tue, 20 Mar 2012 19:16:18 -0700 (PDT) Received: by 10.50.154.231 with SMTP id vr7mr7811280igb.2.1332296178754; Tue, 20 Mar 2012 19:16:18 -0700 (PDT) Received: from mail-ob0-f181.google.com (mail-ob0-f181.google.com [209.85.214.181]) by gmr-mx.google.com with ESMTPS id gv1si62323igb.3.2012.03.20.19.16.18 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 20 Mar 2012 19:16:18 -0700 (PDT) Received-SPF: pass (google.com: domain of robherring2@gmail.com designates 209.85.214.181 as permitted sender) client-ip=209.85.214.181; Received: by obceq6 with SMTP id eq6so433230obc.12 for ; Tue, 20 Mar 2012 19:16:18 -0700 (PDT) Received: by 10.182.54.114 with SMTP id i18mr2599407obp.49.1332296178377; Tue, 20 Mar 2012 19:16:18 -0700 (PDT) Received: from rob-laptop.i.smooth-stone.com (65-36-72-55.dyn.grandenetworks.net. [65.36.72.55]) by mx.google.com with ESMTPS id ch5sm293210obb.16.2012.03.20.19.16.16 (version=SSLv3 cipher=OTHER); Tue, 20 Mar 2012 19:16:17 -0700 (PDT) From: Rob Herring To: linux-arm-kernel@lists.infradead.org Cc: Paul Gortmaker , Nicolas Pitre , linux-next@vger.kernel.org, Rob Herring , Eric Miao , Russell King , Haojian Zhuang , Alessandro Zummo , Jaroslav Kysela , Takashi Iwai , rtc-linux@googlegroups.com, alsa-devel@alsa-project.org Subject: [rtc-linux] [PATCH 2/2] ARM: pxa: use commom IOMEM definiton Date: Tue, 20 Mar 2012 21:15:49 -0500 Message-Id: <1332296149-28110-2-git-send-email-robherring2@gmail.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1332296149-28110-1-git-send-email-robherring2@gmail.com> References: <4F68CD9C.3090001@windriver.com> <1332296149-28110-1-git-send-email-robherring2@gmail.com> X-Original-Sender: robherring2@gmail.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of robherring2@gmail.com designates 209.85.214.181 as permitted sender) smtp.mail=robherring2@gmail.com; dkim=pass header.i=@gmail.com Reply-To: rtc-linux@googlegroups.com Precedence: list Mailing-list: list rtc-linux@googlegroups.com; contact rtc-linux+owners@googlegroups.com List-ID: X-Google-Group-Id: 712029733259 List-Post: , List-Help: , List-Archive: Sender: rtc-linux@googlegroups.com List-Subscribe: , List-Unsubscribe: , From: Rob Herring pxa was missed in the moving of IOMEM to a common defintion, so lots of IOMEM redefined warnings were introduced. So remove pxa IOMEM definition and fix all the fallout. Reported-by: Paul Gortmaker Signed-off-by: Rob Herring Cc: Eric Miao Cc: Russell King Cc: Haojian Zhuang Cc: Alessandro Zummo Cc: Jaroslav Kysela Cc: Takashi Iwai Cc: rtc-linux@googlegroups.com Cc: alsa-devel@alsa-project.org --- arch/arm/mach-pxa/clock-pxa2xx.c | 1 + arch/arm/mach-pxa/corgi_pm.c | 1 + arch/arm/mach-pxa/cpufreq-pxa3xx.c | 1 + arch/arm/mach-pxa/include/mach/hardware.h | 2 -- arch/arm/mach-pxa/mfp-pxa2xx.c | 1 + arch/arm/mach-pxa/pxa2xx.c | 1 + arch/arm/mach-pxa/pxa300.c | 1 + arch/arm/mach-pxa/pxa320.c | 1 + arch/arm/mach-pxa/sharpsl_pm.c | 1 + drivers/rtc/rtc-sa1100.c | 1 + sound/arm/pxa2xx-ac97-lib.c | 1 + sound/arm/pxa2xx-ac97.c | 1 + sound/soc/pxa/pxa2xx-ac97.c | 1 + 13 files changed, 12 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-pxa/clock-pxa2xx.c b/arch/arm/mach-pxa/clock-pxa2xx.c index 1d5859d..9ee2ad6 100644 --- a/arch/arm/mach-pxa/clock-pxa2xx.c +++ b/arch/arm/mach-pxa/clock-pxa2xx.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include diff --git a/arch/arm/mach-pxa/corgi_pm.c b/arch/arm/mach-pxa/corgi_pm.c index 39e265c..048c429 100644 --- a/arch/arm/mach-pxa/corgi_pm.c +++ b/arch/arm/mach-pxa/corgi_pm.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include diff --git a/arch/arm/mach-pxa/cpufreq-pxa3xx.c b/arch/arm/mach-pxa/cpufreq-pxa3xx.c index 88fbec0..b85b4ab 100644 --- a/arch/arm/mach-pxa/cpufreq-pxa3xx.c +++ b/arch/arm/mach-pxa/cpufreq-pxa3xx.c @@ -15,6 +15,7 @@ #include #include #include +#include #include diff --git a/arch/arm/mach-pxa/include/mach/hardware.h b/arch/arm/mach-pxa/include/mach/hardware.h index 54b64ea..56d92e5 100644 --- a/arch/arm/mach-pxa/include/mach/hardware.h +++ b/arch/arm/mach-pxa/include/mach/hardware.h @@ -40,7 +40,6 @@ #define io_p2v(x) IOMEM(0xf2000000 + ((x) & 0x01ffffff) + (((x) & 0x1c000000) >> 1)) #ifndef __ASSEMBLY__ -# define IOMEM(x) ((void __iomem *)(x)) # define __REG(x) (*((volatile u32 __iomem *)io_p2v(x))) /* With indexed regs we don't want to feed the index through io_p2v() @@ -52,7 +51,6 @@ #else -# define IOMEM(x) x # define __REG(x) io_p2v(x) # define __PREG(x) io_v2p(x) diff --git a/arch/arm/mach-pxa/mfp-pxa2xx.c b/arch/arm/mach-pxa/mfp-pxa2xx.c index f147755..b029562 100644 --- a/arch/arm/mach-pxa/mfp-pxa2xx.c +++ b/arch/arm/mach-pxa/mfp-pxa2xx.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include diff --git a/arch/arm/mach-pxa/pxa2xx.c b/arch/arm/mach-pxa/pxa2xx.c index 8682704..f8ec854 100644 --- a/arch/arm/mach-pxa/pxa2xx.c +++ b/arch/arm/mach-pxa/pxa2xx.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include diff --git a/arch/arm/mach-pxa/pxa300.c b/arch/arm/mach-pxa/pxa300.c index 40bb165..17cbc0c 100644 --- a/arch/arm/mach-pxa/pxa300.c +++ b/arch/arm/mach-pxa/pxa300.c @@ -16,6 +16,7 @@ #include #include #include +#include #include diff --git a/arch/arm/mach-pxa/pxa320.c b/arch/arm/mach-pxa/pxa320.c index 8d614ec..6dc99d4 100644 --- a/arch/arm/mach-pxa/pxa320.c +++ b/arch/arm/mach-pxa/pxa320.c @@ -16,6 +16,7 @@ #include #include #include +#include #include diff --git a/arch/arm/mach-pxa/sharpsl_pm.c b/arch/arm/mach-pxa/sharpsl_pm.c index 8d5168d..6d3b39f 100644 --- a/arch/arm/mach-pxa/sharpsl_pm.c +++ b/arch/arm/mach-pxa/sharpsl_pm.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include diff --git a/drivers/rtc/rtc-sa1100.c b/drivers/rtc/rtc-sa1100.c index cb9a585..398ab7a 100644 --- a/drivers/rtc/rtc-sa1100.c +++ b/drivers/rtc/rtc-sa1100.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include diff --git a/sound/arm/pxa2xx-ac97-lib.c b/sound/arm/pxa2xx-ac97-lib.c index d1aa421..d760371 100644 --- a/sound/arm/pxa2xx-ac97-lib.c +++ b/sound/arm/pxa2xx-ac97-lib.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include diff --git a/sound/arm/pxa2xx-ac97.c b/sound/arm/pxa2xx-ac97.c index 3a39626..afef72c 100644 --- a/sound/arm/pxa2xx-ac97.c +++ b/sound/arm/pxa2xx-ac97.c @@ -11,6 +11,7 @@ */ #include +#include #include #include diff --git a/sound/soc/pxa/pxa2xx-ac97.c b/sound/soc/pxa/pxa2xx-ac97.c index 837ff34..b4bfd97 100644 --- a/sound/soc/pxa/pxa2xx-ac97.c +++ b/sound/soc/pxa/pxa2xx-ac97.c @@ -11,6 +11,7 @@ */ #include +#include #include #include