From patchwork Thu May 22 16:47:15 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Deacon X-Patchwork-Id: 30652 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f72.google.com (mail-yh0-f72.google.com [209.85.213.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id DD06120671 for ; Thu, 22 May 2014 16:56:14 +0000 (UTC) Received: by mail-yh0-f72.google.com with SMTP id f73sf13916389yha.7 for ; Thu, 22 May 2014 09:56:14 -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=qzial/EZndJdCgT3vpoKU64HttU+1PSlq711+6tm3Xo=; b=gVVbx6lWc4kY3HqyDIX7SEmIBvQ8nHNx0dfffp+Q+MltmoAtxmw8R8IhPU4/+1ZJG1 6QVH+klmo0oAoC2RSNDkqPKYEqlXmvtYTwhURAMz/ILfJutXznAwxwc/zr5QbESJ4hgc oamFkEwtJyiRuIlGy/EbPO2lJ/JurRf5b3Fokhuz9Xckucax+K7sf1Pzs21vmjMvZsud JCPbys2ikWH5I04lgZ55X3W/MqYyP/fXvBKXstfJbO89zOjfMKPSt79l9mKeniuqRH9q y850e9ep2KzukBtuBVW2Rz81pasiVmeC3TnWd8R0AMscUQv9CDMtzDuMCpH/xsWtJ3TP 1n6g== X-Gm-Message-State: ALoCoQmAx+NixrsmIV84mXIw+I4cv3eUID4T22aMdjuSuebq5uKMEo8vrFTwVDN2jvBe7DeGSQE2 X-Received: by 10.58.155.3 with SMTP id vs3mr25926553veb.16.1400777774634; Thu, 22 May 2014 09:56:14 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.32.203 with SMTP id h69ls1267765qgh.56.gmail; Thu, 22 May 2014 09:56:14 -0700 (PDT) X-Received: by 10.58.188.115 with SMTP id fz19mr2322580vec.40.1400777774491; Thu, 22 May 2014 09:56:14 -0700 (PDT) Received: from mail-ve0-f180.google.com (mail-ve0-f180.google.com [209.85.128.180]) by mx.google.com with ESMTPS id v2si224322vcn.15.2014.05.22.09.56.14 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 22 May 2014 09:56:14 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.180 as permitted sender) client-ip=209.85.128.180; Received: by mail-ve0-f180.google.com with SMTP id db12so4696703veb.25 for ; Thu, 22 May 2014 09:56:14 -0700 (PDT) X-Received: by 10.220.195.196 with SMTP id ed4mr2080288vcb.42.1400777774389; Thu, 22 May 2014 09:56:14 -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.220.221.72 with SMTP id ib8csp215621vcb; Thu, 22 May 2014 09:56:14 -0700 (PDT) X-Received: by 10.67.5.233 with SMTP id cp9mr51815882pad.147.1400777773559; Thu, 22 May 2014 09:56:13 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id nu2si454957pbc.98.2014.05.22.09.56.12; Thu, 22 May 2014 09:56:12 -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 S1753404AbaEVQ4D (ORCPT + 27 others); Thu, 22 May 2014 12:56:03 -0400 Received: from cam-admin0.cambridge.arm.com ([217.140.96.50]:48868 "EHLO cam-admin0.cambridge.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752738AbaEVQsQ (ORCPT ); Thu, 22 May 2014 12:48:16 -0400 Received: from edgewater-inn.cambridge.arm.com (edgewater-inn.cambridge.arm.com [10.1.203.25]) by cam-admin0.cambridge.arm.com (8.12.6/8.12.6) with ESMTP id s4MGlWwo028173; Thu, 22 May 2014 17:47:32 +0100 (BST) Received: by edgewater-inn.cambridge.arm.com (Postfix, from userid 1000) id 508EF1AE340A; Thu, 22 May 2014 17:47:34 +0100 (BST) From: Will Deacon To: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org Cc: arnd@arndb.de, monstr@monstr.eu, dhowells@redhat.com, broonie@linaro.org, benh@kernel.crashing.org, peterz@infradead.org, paulmck@linux.vnet.ibm.com, Will Deacon , Heiko Carstens , Martin Schwidefsky Subject: [PATCH v2 03/18] s390: io: remove dummy relaxed accessor macros for reads Date: Thu, 22 May 2014 17:47:15 +0100 Message-Id: <1400777250-17335-4-git-send-email-will.deacon@arm.com> X-Mailer: git-send-email 1.9.2 In-Reply-To: <1400777250-17335-1-git-send-email-will.deacon@arm.com> References: <1400777250-17335-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.128.180 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: , These are now defined by asm-generic/io.h, so we don't need the private definitions anymore. Cc: Heiko Carstens Cc: Martin Schwidefsky Signed-off-by: Will Deacon --- arch/s390/include/asm/io.h | 5 ----- 1 file changed, 5 deletions(-) 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