From patchwork Wed Sep 24 17:17:36 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Deacon X-Patchwork-Id: 37854 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f200.google.com (mail-wi0-f200.google.com [209.85.212.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id DAE61204FF for ; Wed, 24 Sep 2014 17:22:09 +0000 (UTC) Received: by mail-wi0-f200.google.com with SMTP id hi2sf3821697wib.7 for ; Wed, 24 Sep 2014 10:22:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=+gmMfIWxPwIaCbwWe41cpBXwTXzK/Fednri49T6IO6c=; b=l2dZM1l7DxY9Q+zsoflSSbL1deC0OANzhoIHrEESBegLmUgoJxNsPbI0x9exDweH06 psbsRToFWxws+cEo72s2Y9jZT8J6ZETTk9ewxJgYyX+hYXOntnGcbFF2+4B4aCHqwVsu xAF/exyjMxEsmFVFEjDl0LVAi4Cy8+LvEa3SIKACVZF3550+GzYeJNgZAmaTR+fPXGZS mzZe9KTnxv+oPufrZuZ6dZkENRGofjpcqxTMECxY+ylAo3JeBK9XSO38rFFTrOOeYMLV UHOR6rHVJvKZN+w56H79Nd8CKbBDRq1UctIfN+eTW8ErGmu06PefnCHiALRDSvM3lK3v NsqA== X-Gm-Message-State: ALoCoQkcRP5NSZ7w5Xzf3TER7aFHbjA5WA0nTrXhybT03VIZ0zAVNiBwA7hZfFVoQ6fFSCVU96IT X-Received: by 10.194.179.196 with SMTP id di4mr304676wjc.0.1411579328993; Wed, 24 Sep 2014 10:22:08 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.30.3 with SMTP id o3ls174936lah.14.gmail; Wed, 24 Sep 2014 10:22:08 -0700 (PDT) X-Received: by 10.112.158.170 with SMTP id wv10mr7472237lbb.66.1411579328780; Wed, 24 Sep 2014 10:22:08 -0700 (PDT) Received: from mail-lb0-f177.google.com (mail-lb0-f177.google.com [209.85.217.177]) by mx.google.com with ESMTPS id mi5si23672606lbc.61.2014.09.24.10.22.08 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 24 Sep 2014 10:22:08 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.177 as permitted sender) client-ip=209.85.217.177; Received: by mail-lb0-f177.google.com with SMTP id z12so10982541lbi.22 for ; Wed, 24 Sep 2014 10:22:08 -0700 (PDT) X-Received: by 10.152.22.137 with SMTP id d9mr7828524laf.29.1411579328645; Wed, 24 Sep 2014 10:22:08 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.130.169 with SMTP id of9csp621272lbb; Wed, 24 Sep 2014 10:22:07 -0700 (PDT) X-Received: by 10.68.105.197 with SMTP id go5mr10877354pbb.73.1411579327133; Wed, 24 Sep 2014 10:22:07 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id rb5si27181092pab.183.2014.09.24.10.22.06 for ; Wed, 24 Sep 2014 10:22:07 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754568AbaIXRWD (ORCPT + 27 others); Wed, 24 Sep 2014 13:22:03 -0400 Received: from cam-admin0.cambridge.arm.com ([217.140.96.50]:41720 "EHLO cam-admin0.cambridge.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753576AbaIXRUp (ORCPT ); Wed, 24 Sep 2014 13:20:45 -0400 Received: from edgewater-inn.cambridge.arm.com (edgewater-inn.cambridge.arm.com [10.1.203.204]) by cam-admin0.cambridge.arm.com (8.12.6/8.12.6) with ESMTP id s8OHIrwq025693; Wed, 24 Sep 2014 18:18:54 +0100 (BST) Received: by edgewater-inn.cambridge.arm.com (Postfix, from userid 1000) id E6E711AE122A; Wed, 24 Sep 2014 18:18:57 +0100 (BST) From: Will Deacon To: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org Cc: arnd@arndb.de, benh@kernel.crashing.org, chris@zankel.net, cmetcalf@tilera.com, davem@davemloft.net, deller@gmx.de, dhowells@redhat.com, geert@linux-m68k.org, heiko.carstens@de.ibm.com, hpa@zytor.com, jcmvbkbc@gmail.com, jesper.nilsson@axis.com, mingo@redhat.com, monstr@monstr.eu, paulmck@linux.vnet.ibm.com, rdunlap@infradead.org, sam@ravnborg.org, schwidefsky@de.ibm.com, starvik@axis.com, takata@linux-m32r.org, tglx@linutronix.de, tony.luck@intel.com, daniel.thompson@linaro.org, broonie@linaro.org, linux@arm.linux.org.uk, Will Deacon Subject: [PATCH v3 17/17] asm-generic: io: define relaxed accessor macros unconditionally Date: Wed, 24 Sep 2014 18:17:36 +0100 Message-Id: <1411579056-16966-18-git-send-email-will.deacon@arm.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1411579056-16966-1-git-send-email-will.deacon@arm.com> References: <1411579056-16966-1-git-send-email-will.deacon@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: will.deacon@arm.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.177 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Now that no architectures using asm-generic/io.h define their own relaxed accessors, the dummy definitions can be used unconditionally. Cc: Arnd Bergmann Signed-off-by: Will Deacon --- include/asm-generic/io.h | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h index 9ccedeb06522..f5611abb82ed 100644 --- a/include/asm-generic/io.h +++ b/include/asm-generic/io.h @@ -53,27 +53,21 @@ static inline u32 __raw_readl(const volatile void __iomem *addr) #endif #define readb __raw_readb -#ifndef readb_relaxed #define readb_relaxed readb -#endif #define readw readw static inline u16 readw(const volatile void __iomem *addr) { return __le16_to_cpu(__raw_readw(addr)); } -#ifndef readw_relaxed #define readw_relaxed readw -#endif #define readl readl static inline u32 readl(const volatile void __iomem *addr) { return __le32_to_cpu(__raw_readl(addr)); } -#ifndef readl_relaxed #define readl_relaxed readl -#endif #ifndef __raw_writeb static inline void __raw_writeb(u8 b, volatile void __iomem *addr) @@ -97,19 +91,13 @@ static inline void __raw_writel(u32 b, volatile void __iomem *addr) #endif #define writeb __raw_writeb -#ifndef writeb_relaxed #define writeb_relaxed writeb -#endif #define writew(b,addr) __raw_writew(__cpu_to_le16(b),addr) -#ifndef writew_relaxed #define writew_relaxed writew -#endif #define writel(b,addr) __raw_writel(__cpu_to_le32(b),addr) -#ifndef writel_relaxed #define writel_relaxed writel -#endif #ifdef CONFIG_64BIT #ifndef __raw_readq @@ -124,9 +112,7 @@ static inline u64 readq(const volatile void __iomem *addr) { return __le64_to_cpu(__raw_readq(addr)); } -#ifndef readq_relaxed #define readq_relaxed readq -#endif #ifndef __raw_writeq static inline void __raw_writeq(u64 b, volatile void __iomem *addr) @@ -136,9 +122,7 @@ static inline void __raw_writeq(u64 b, volatile void __iomem *addr) #endif #define writeq(b, addr) __raw_writeq(__cpu_to_le64(b), addr) -#ifndef writeq_relaxed #define writeq_relaxed writeq -#endif #endif /* CONFIG_64BIT */ #ifndef PCI_IOBASE