From patchwork Tue Jan 2 10:56:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 123117 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp8821308qgn; Tue, 2 Jan 2018 02:57:03 -0800 (PST) X-Google-Smtp-Source: ACJfBos0nuYqlzx5Kux37RJP6bjeTQqCBvQCMsxWOBt7M/7yK74G7gJNyFmT0scDi708rkdiPi5Z X-Received: by 10.101.73.77 with SMTP id q13mr8505276pgs.127.1514890623586; Tue, 02 Jan 2018 02:57:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514890623; cv=none; d=google.com; s=arc-20160816; b=xhPLOEF4Yqph+YZOU1+7C53B0ZHQqGtF61U47jCEvLVt+hg/pTgiJ5+KdklWubvOIu efcwEE27hSN+Ucmy/zLJD2puQn29XaGVprsLKu5m68su5D7XFjPCBE1Gs15EVmC0s891 QWc/2ahghM5ygFSXdln8J/vekpx8HkOv/0SJHh0+K6q0UuQFlUMby0DdC7iS4Ee5jHJn I5DrYUNWTG/j+QiUYWwrYVW2SLzVtSUj2656Wv+lZ+1ugv0pHu1gkvmwnzM5f/QH/csw AJLzAxbicWPK53rdoVaO1uhi3mtrqjJxe8XSU3k+QIss14btgsiTL6uZEEvURbMpJ4Xa J7GQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=P5MZrckgAFNhNwz/AyaEvedZPUtqU9Wr3wNHMLdAfpY=; b=to6d5RP5Kp0ETUF39kjXbzgZZHUdGDQ2j6vYCAY3sgeYHzWu+ZGaRur3t1R28Q6LO0 /W9Yycgv8CWD1M0vVrSc1d8CaVA7YO41ZFZoFJhd88et+cGy+ST6dBzK/AfzJG27HuOF P/y/pd5rnVqrrcfShLhchUembrTUrrkm0Hne0qsZyImd9vChzDNkZjxN4E1mRGvd2F9o iv0p15tn7QX79Ronj5VXCvXSO2aVy3xGjpkthmY+wseKtAKAF/L+/Dht2F0eprt8wJ7A 3+G7YIEMjQ8uLozKGcKGFHqo/8e91BoE2emVl/E8L30TOj/KDo2e9BbVQKtcI3jpL/GM 1Xow== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 9si26698770plb.812.2018.01.02.02.57.03; Tue, 02 Jan 2018 02:57:03 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752533AbeABK5A (ORCPT + 28 others); Tue, 2 Jan 2018 05:57:00 -0500 Received: from mout.kundenserver.de ([212.227.126.134]:54063 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751503AbeABK46 (ORCPT ); Tue, 2 Jan 2018 05:56:58 -0500 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue007 [212.227.15.129]) with ESMTPA (Nemesis) id 0MgUqY-1eJceH45UU-00Nfvq; Tue, 02 Jan 2018 11:56:56 +0100 From: Arnd Bergmann To: Andrew Morton Cc: linux-arch@vger.kernel.org, Arnd Bergmann , linux-kernel@vger.kernel.org Subject: [PATCH] m32r: fix readl/writel prototypes Date: Tue, 2 Jan 2018 11:56:41 +0100 Message-Id: <20180102105653.1645748-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:jD9bSn3TWdoNukvV+g6PyaP4AAEEzQHLes3I/wLrJ6wVPc5icmn WliSI9GfAXmmNO23Hw7rhgepUcK5IepE3LWDNdWIT1m1P0KlOUCnI0t97WppsPQUIoVeqpQ E3qoQwaE8FTNutyDLm+o56Zx8TKTOnS7fM0/1ccnTukjFwn63O2t2XMTbSbdjt4GDmzycmc vF2l8P93LN6CFSsSzdKgA== X-UI-Out-Filterresults: notjunk:1; V01:K0:a19WU1XsluI=:EZ2a0RD+xTofINTn4Phtuf wblF6Xn3JBLMibt4FgRXUK9/Srg0mQleF0AEDgNzxinvClF+pwfYKUadkcEdOGVURubpnsdFM 2U5i+izMgKjIpNTmSLZkVEDMgX4m3Vs2xwUfUfvT54lXttsvG0nUkkTs+jP2tJ7vzUURTpXoG RmxwBcPDdTTGE6q7hP7GKYAOXH+32g2oSUeUzxEFI0eTyv+t8Hslsap5ruKAD6alKnyPWhGHv Z1/li3JN2I1NTjk5owA8MxoA9g5GL4J36NBkOBeBn8+MtjhCT19mAtFAuqTrLe9LallSZ3OIh 6GhAHaW94DSc4m/v6q10zVMj5VVaBDu1CqypBJpdK5WDjJ/W5O4f5zxWY4k2mnX/8ML/gO6kn HgNCToSYdgn2+n3W/HjyBY8YlMTS+DDQyX94k8TFioHxv98deEP99S+nQZH3AA6+8pjQpJf/S IHgIxeBqJs/y0QvyRWSU/VqwexeQOiLbYmJEz0NX7Kkbd5rV60X2bMcKrPSrtyArpGc1ttLGD 7MCsOBZ5XR3BjVlL1L/sjZf0Q6vAUbnVOdA1fS08vxNhc1J7SQ60FpjdJM3CpPUeHC86rrZZl ELGpGBKQ+BHzdHshjfpaldmlwxlskgBf7rllmWYYhnjlgaoiuO7l/GbmerfbTe/EVFJajovqz Z2asDG2WGyexV9mUFbTmBMgcHF6b3tdL+Lr2qOS/mhsTPSKvlgzCj7XG5Y/Z1kH9CKtzDLFzN b7wbsbbFQnv/28tKBfEGNdGcTy1/29orN90UDA== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org All other architectures use 'unsigned int' as the data in readl/write, but m32r uses 'unsigned long', leading to lots of harmless build warnings like: drivers/mmc/host/dw_mmc.c: In function 'dw_mci_regs_show': drivers/mmc/host/dw_mmc.c:168:31: warning: format '%x' expects argument of type 'unsigned int', but argument 3 has type 'long unsigned int' [-Wformat=] seq_printf(s, "STATUS:\t0x%08x\n", mci_readl(host, STATUS)); Signed-off-by: Arnd Bergmann --- arch/m32r/include/asm/io.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 2.9.0 Reviewed-by: Geert Uytterhoeven diff --git a/arch/m32r/include/asm/io.h b/arch/m32r/include/asm/io.h index 1b653bb16f9a..093486b5b931 100644 --- a/arch/m32r/include/asm/io.h +++ b/arch/m32r/include/asm/io.h @@ -108,9 +108,9 @@ static inline unsigned short _readw(unsigned long addr) return *(volatile unsigned short __force *)addr; } -static inline unsigned long _readl(unsigned long addr) +static inline unsigned int _readl(unsigned long addr) { - return *(volatile unsigned long __force *)addr; + return *(volatile unsigned int __force *)addr; } static inline void _writeb(unsigned char b, unsigned long addr) @@ -123,9 +123,9 @@ static inline void _writew(unsigned short w, unsigned long addr) *(volatile unsigned short __force *)addr = w; } -static inline void _writel(unsigned long l, unsigned long addr) +static inline void _writel(unsigned long l, unsigned int addr) { - *(volatile unsigned long __force *)addr = l; + *(volatile unsigned int __force *)addr = l; } #define inb _inb