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: 1460671 Return-Path: X-Original-To: patchwork-linux-fbdev@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id AAC6A3FD40 for ; Fri, 14 Sep 2012 21:40:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758000Ab2INVji (ORCPT ); Fri, 14 Sep 2012 17:39:38 -0400 Received: from moutng.kundenserver.de ([212.227.17.9]:64421 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757214Ab2INVfb (ORCPT ); Fri, 14 Sep 2012 17:35:31 -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 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== Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org 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);