From patchwork Fri Sep 14 21:34:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 11446 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 ABB7423E42 for ; Fri, 14 Sep 2012 21:35:56 +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 2F79BA39257 for ; Fri, 14 Sep 2012 21:35:54 +0000 (UTC) Received: by mail-iy0-f180.google.com with SMTP id j25so3512422iaf.11 for ; Fri, 14 Sep 2012 14:35:54 -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=Cj5cUm+b6+JVaUQWvrnAxtODCO13y4c9NzTY2kDq67g=; b=fkiAuxudXRRXX4dGBf4ShCCGHnQuMnLUX54b9tjtBKrndiu0y5zoOFe7o2EPUcgv7k Qn1dRiieLVLKJEabUvfNoAxO78CZbcHvvsutzxZIJeKOlkKSLkaa5bBtGcYydErPGScj K/KqgWUpicd9c0Un7jKf27VkEmyJeyDJ8RVkxSXj7p9wOLaijvoWqR0BWwLIKFBajgVY Rm69WGQv55W9vXX7LQgazzIqEVGpRs1Ln7ABJylZWm/VUpBx3+Zg/pZ7VOdYigB0eZaH /anSR9DoNwbeEUHIN8czpeshC0orjL23peKVSTLcEXhkXYsMUpknglc8P8tTNZQzPYEK ym8w== Received: by 10.50.89.164 with SMTP id bp4mr121111igb.28.1347658553968; Fri, 14 Sep 2012 14:35:53 -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 ex8csp215446igc; Fri, 14 Sep 2012 14:35:53 -0700 (PDT) Received: by 10.204.153.10 with SMTP id i10mr2141216bkw.67.1347658552617; Fri, 14 Sep 2012 14:35:52 -0700 (PDT) Received: from moutng.kundenserver.de (moutng.kundenserver.de. [212.227.17.9]) by mx.google.com with ESMTP id hk8si4076668bkc.93.2012.09.14.14.35.52; Fri, 14 Sep 2012 14:35:52 -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 0LeS5t-1Tt7Ii11qf-00qfJG; Fri, 14 Sep 2012 23:35:29 +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 , Florian Tobias Schandinat , linux-fbdev@vger.kernel.org Subject: [PATCH 23/24] video: da8xx-fb: use __iomem pointers for MMIO Date: Fri, 14 Sep 2012 23:34:51 +0200 Message-Id: <1347658492-11608-24-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:mckx0+7tqHmfiCd9VnFssDdR8zITPjtm/JfzsPZrgQk j+hHcjZ+DJ4BqPSKVSSmhugcwYc6p7eAqwHleaahn2gKPjuAqC xe1HwTREPkx43/mbjc24wyDI7PExK//vZvCTwXgpWnJM6wAAay p7L8dN3QEpNyzhgIotyHzf3pOyu+MHUDEiCge4UKMKjqqTz7qf tuQ6oFBXfrs1ubmoN+xCLI/SWfl7u8cIMZNcrQm5YWwhXFI5wV rfNHlwzpk9fJzZqPY0kWAK057NldAgVSH92mB8eMl1obPNNimv przUzVCVin7Ux8YA0PHxdI2YeR+9kAb6c7e3tSn5Q7fh9k4nqu RNu3LXt0GZU7AEQUckNEzYHO2b+CZdttuMQpGBrOfurVG2zxAQ RiQ2dcm/7MqUQ== X-Gm-Message-State: ALoCoQnbSPybMec82JVbYueMmAC6e1csOeBlfMyXdipQ3XM0KXyHTbPHBasuxPN9JLofnVO41UZP ARM is moving to stricter checks on readl/write functions, so we need to use the correct types everywhere. Cc: Florian Tobias Schandinat Cc: linux-fbdev@vger.kernel.org Signed-off-by: Arnd Bergmann --- drivers/video/da8xx-fb.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/video/da8xx-fb.c b/drivers/video/da8xx-fb.c index 7ae9d53..113d43a 100644 --- a/drivers/video/da8xx-fb.c +++ b/drivers/video/da8xx-fb.c @@ -131,7 +131,7 @@ #define UPPER_MARGIN 32 #define LOWER_MARGIN 32 -static resource_size_t da8xx_fb_reg_base; +static void __iomem *da8xx_fb_reg_base; static struct resource *lcdc_regs; static unsigned int lcd_revision; static irq_handler_t lcdc_irq_handler; @@ -951,7 +951,7 @@ static int __devexit fb_remove(struct platform_device *dev) clk_disable(par->lcdc_clk); clk_put(par->lcdc_clk); framebuffer_release(info); - iounmap((void __iomem *)da8xx_fb_reg_base); + iounmap(da8xx_fb_reg_base); release_mem_region(lcdc_regs->start, resource_size(lcdc_regs)); } @@ -1171,7 +1171,7 @@ static int __devinit fb_probe(struct platform_device *device) if (!lcdc_regs) return -EBUSY; - da8xx_fb_reg_base = (resource_size_t)ioremap(lcdc_regs->start, len); + da8xx_fb_reg_base = ioremap(lcdc_regs->start, len); if (!da8xx_fb_reg_base) { ret = -EBUSY; goto err_request_mem; @@ -1392,7 +1392,7 @@ err_clk_put: clk_put(fb_clk); err_ioremap: - iounmap((void __iomem *)da8xx_fb_reg_base); + iounmap(da8xx_fb_reg_base); err_request_mem: release_mem_region(lcdc_regs->start, len);