From patchwork Fri Sep 14 21:34:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 1460731 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 01D77DF280 for ; Fri, 14 Sep 2012 21:40:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758028Ab2INVkP (ORCPT ); Fri, 14 Sep 2012 17:40:15 -0400 Received: from moutng.kundenserver.de ([212.227.17.9]:61017 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757164Ab2INVfa (ORCPT ); Fri, 14 Sep 2012 17:35:30 -0400 Received: from localhost.localdomain (HSI-KBW-149-172-5-253.hsi13.kabel-badenwuerttemberg.de [149.172.5.253]) by mrelayeu.kundenserver.de (node=mrbap2) with ESMTP (Nemesis) id 0Lnlkd-1Tjne30a4N-00hLdU; Fri, 14 Sep 2012 23:35:28 +0200 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, Will Deacon , Russell King , Nicolas Pitre , Arnd Bergmann , Dmitry Torokhov , linux-input@vger.kernel.org Subject: [PATCH 20/24] input: rpcmouse: use __iomem pointers for MMIO Date: Fri, 14 Sep 2012 23:34:48 +0200 Message-Id: <1347658492-11608-21-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1347658492-11608-1-git-send-email-arnd@arndb.de> References: <1347658492-11608-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:QSv4Ths/yb92LBwmOZdzA0sjn1or97u6IlrVSjT+rdT HhUrAaV4l1PHLihCw5X4UwoiKxuI1jQSMetr1b+uWcy4w0n+pu R1/e+hf/T82hsYqjV7oIgAX4rELHfiudw7xaejrzYZW5O/0/Sv ZH0FImJn9TYh5FgKKhc5LMu8n98H/OR407R6hrQul1BrKFm43b CFQK7QMrvNGZvnftf+9h/DL/dKGMiiDfbIldV5sPY4Q3N5Tgcj YTh8EhoY/DUk+NvLKYvcH79Na9FnP8ZRt4weM254oxX3OrqRtT XPgm9QQ0I6foR8jLPcoK8ro9vhiZcN5dmw3Nw9fmuWSeUQBD4v ghUeOIEx7mFwuDTIBD6pcUYIVd1lRVFOyKMfl8fZ68eCpBV5i4 h5bB8ocoBCYBQ== Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org ARM is moving to stricter checks on readl/write functions, so we need to use the correct types everywhere. Cc: Dmitry Torokhov Cc: linux-input@vger.kernel.org Signed-off-by: Arnd Bergmann Acked-by: Dmitry Torokhov --- drivers/input/mouse/rpcmouse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/input/mouse/rpcmouse.c b/drivers/input/mouse/rpcmouse.c index 272dedd..21c60fe 100644 --- a/drivers/input/mouse/rpcmouse.c +++ b/drivers/input/mouse/rpcmouse.c @@ -42,7 +42,7 @@ static irqreturn_t rpcmouse_irq(int irq, void *dev_id) x = (short) iomd_readl(IOMD_MOUSEX); y = (short) iomd_readl(IOMD_MOUSEY); - b = (short) (__raw_readl(0xe0310000) ^ 0x70); + b = (short) (__raw_readl(IOMEM(0xe0310000)) ^ 0x70); dx = x - rpcmouse_lastx; dy = y - rpcmouse_lasty;