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: 11431 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 3F8CE240A1 for ; Fri, 14 Sep 2012 21:35:32 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id AD0A3A39244 for ; Fri, 14 Sep 2012 21:35:30 +0000 (UTC) Received: by mail-iy0-f180.google.com with SMTP id j25so3512422iaf.11 for ; Fri, 14 Sep 2012 14:35:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-provags-id:x-gm-message-state; bh=75WBzcDSlzzvEPCAo1PKnScMZdIJOxnMKxMkQuAzSRs=; b=jVZ1RhAQtuCheiJ2cvvxAw2VNJPFlJN10+m3Wi4UM/0D3m/CiId/hf+viLIpruO125 8oRtaXWAid7/39No04YzAfSmwTD/qYIV1w+cx5QMOzrYb7DB6UIPwenlDmjNJwgvVzGe exd8XXsBs7mDnl4CaV1cvjpweDtlYiSof3qJuqfCv/SrA1SYHD2349D31R5trUFVqRYc FmP/cAoNf+juBEhG7BUn7TQiapHky6Ohz1dgprjS1BLWslNxGx8ljKl0XgBx1vB0HyN8 Qlug6XDI5Rres0SXSXA7CGbipO2mVoIjKG3D9/AhLykPJG2nJZ5u5e0v05+Q/tmB1vr4 bD8A== Received: by 10.50.7.212 with SMTP id l20mr105471iga.43.1347658530476; Fri, 14 Sep 2012 14:35:30 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.232 with SMTP id ex8csp215410igc; Fri, 14 Sep 2012 14:35:29 -0700 (PDT) Received: by 10.180.24.197 with SMTP id w5mr647575wif.22.1347658528947; Fri, 14 Sep 2012 14:35:28 -0700 (PDT) Received: from moutng.kundenserver.de (moutng.kundenserver.de. [212.227.17.9]) by mx.google.com with ESMTP id f2si1187742wiz.13.2012.09.14.14.35.28; Fri, 14 Sep 2012 14:35:28 -0700 (PDT) Received-SPF: neutral (google.com: 212.227.17.9 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) client-ip=212.227.17.9; Authentication-Results: mx.google.com; spf=neutral (google.com: 212.227.17.9 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) smtp.mail=arnd@arndb.de 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== X-Gm-Message-State: ALoCoQlYD8Zt7svAomTIZ+mJN8iQQdMNTpicEoKKZVf7+WinCDf5IYLEazpDknLAU0rWVJAv/1Kw 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 --- 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;