| Message ID | 1411579056-16966-4-git-send-email-will.deacon@arm.com |
|---|---|
| State | Accepted |
| Commit | 916136b374566181386bb79ed638de8a8d8b426e |
| Headers | show
Return-Path: <patchwork-forward+bncBDAZZCVNSYPBBZX2ROQQKGQEZKPHLOI@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f199.google.com (mail-lb0-f199.google.com [209.85.217.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5ACA6204FF for <linaro@patches.linaro.org>; Wed, 24 Sep 2014 17:20:39 +0000 (UTC) Received: by mail-lb0-f199.google.com with SMTP id z12sf3289046lbi.2 for <linaro@patches.linaro.org>; Wed, 24 Sep 2014 10:20:38 -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=TlYMfWaAGglq1DeEaKAwcRJj/ntCyn4lgGMnL8HqSVY=; b=FKn6ToLGFkactsCz7pOz4zZUO+M96WFtVEbqQoYdmN0YqCs1CuRBAooLENnwv0IsF0 Azw7/u9vdVoJNUzFIdri9i5PwHRLSSBxCyUbDEl08T+BMMs6KCBGf8oKVJRrL6ufV078 QKbRB2kFvuPVSmudKjIrPdR9WN5hPLGKl8pXHeoOhIObfqNWV9nLS2f0mUiHrwnhExVV kZ533Xpby4rPMdi2LqNBxzhHXkCy0PYjgOwcdabmXu4B/ePhKF58wxWnvmkUMFHsAkYr 4A84UVTi3RIaPF4l+rcf8Zyzq5vYijqdeXUpAkXxnDjUElE0b7GTpYkdD7HjIlQxH70j NHpw== X-Gm-Message-State: ALoCoQlBQwPyIrkJb/zEVi9jWwyxlV0CEkkZBD1Fi2OaE+zqrByt6q5ry75hOyV1yf3g98fPpOUh X-Received: by 10.180.183.165 with SMTP id en5mr4286875wic.1.1411579238160; Wed, 24 Sep 2014 10:20:38 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.234.40 with SMTP id ub8ls189928lac.70.gmail; Wed, 24 Sep 2014 10:20:37 -0700 (PDT) X-Received: by 10.112.171.202 with SMTP id aw10mr7396496lbc.52.1411579237854; Wed, 24 Sep 2014 10:20:37 -0700 (PDT) Received: from mail-la0-f50.google.com (mail-la0-f50.google.com [209.85.215.50]) by mx.google.com with ESMTPS id kf3si23659967lbc.68.2014.09.24.10.20.37 for <patchwork-forward@linaro.org> (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 24 Sep 2014 10:20:37 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.50 as permitted sender) client-ip=209.85.215.50; Received: by mail-la0-f50.google.com with SMTP id ty20so11002954lab.37 for <patchwork-forward@linaro.org>; Wed, 24 Sep 2014 10:20:37 -0700 (PDT) X-Received: by 10.112.200.134 with SMTP id js6mr7498519lbc.0.1411579237748; Wed, 24 Sep 2014 10:20:37 -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 of9csp620940lbb; Wed, 24 Sep 2014 10:20:37 -0700 (PDT) X-Received: by 10.68.131.38 with SMTP id oj6mr10845433pbb.168.1411579235832; Wed, 24 Sep 2014 10:20:35 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i10si26550162pdr.145.2014.09.24.10.20.35 for <multiple recipients>; Wed, 24 Sep 2014 10:20:35 -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 S1753622AbaIXRUa (ORCPT <rfc822;ankit.jindal@linaro.org> + 27 others); Wed, 24 Sep 2014 13:20:30 -0400 Received: from cam-admin0.cambridge.arm.com ([217.140.96.50]:41629 "EHLO cam-admin0.cambridge.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751883AbaIXRU1 (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Wed, 24 Sep 2014 13:20:27 -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 s8OHIowo025677; Wed, 24 Sep 2014 18:18:50 +0100 (BST) Received: by edgewater-inn.cambridge.arm.com (Postfix, from userid 1000) id 13D8B1AE1101; Wed, 24 Sep 2014 18:18:57 +0100 (BST) From: Will Deacon <will.deacon@arm.com> 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 <will.deacon@arm.com> Subject: [PATCH v3 03/17] s390: io: remove dummy relaxed accessor macros for reads Date: Wed, 24 Sep 2014 18:17:22 +0100 Message-Id: <1411579056-16966-4-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: <patchwork-forward.linaro.org> 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.215.50 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: <http://groups.google.com/a/linaro.org/group/patchwork-forward/post>, <mailto:patchwork-forward@linaro.org> List-Help: <http://support.google.com/a/linaro.org/bin/topic.py?topic=25838>, <mailto:patchwork-forward+help@linaro.org> List-Archive: <http://groups.google.com/a/linaro.org/group/patchwork-forward/> List-Unsubscribe: <mailto:googlegroups-manage+836684582541+unsubscribe@googlegroups.com>, <http://groups.google.com/a/linaro.org/group/patchwork-forward/subscribe> |
diff --git a/arch/s390/include/asm/io.h b/arch/s390/include/asm/io.h index cd6b9ee7b69c..722befdf8332 100644 --- a/arch/s390/include/asm/io.h +++ b/arch/s390/include/asm/io.h @@ -60,11 +60,6 @@ static inline void iounmap(volatile void __iomem *addr) #define __raw_writel zpci_write_u32 #define __raw_writeq zpci_write_u64 -#define readb_relaxed readb -#define readw_relaxed readw -#define readl_relaxed readl -#define readq_relaxed readq - #endif /* CONFIG_PCI */ #include <asm-generic/io.h>
These are now defined by asm-generic/io.h, so we don't need the private definitions anymore. Cc: Heiko Carstens <heiko.carstens@de.ibm.com> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Will Deacon <will.deacon@arm.com> --- arch/s390/include/asm/io.h | 5 ----- 1 file changed, 5 deletions(-)