From patchwork Sat Oct 20 07:02:20 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Lad, Prabhakar" X-Patchwork-Id: 1620861 Return-Path: X-Original-To: patchwork-linux-media@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 D1D363FC1A for ; Sat, 20 Oct 2012 07:02:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751259Ab2JTHCk (ORCPT ); Sat, 20 Oct 2012 03:02:40 -0400 Received: from mail-pa0-f46.google.com ([209.85.220.46]:38409 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750708Ab2JTHCj (ORCPT ); Sat, 20 Oct 2012 03:02:39 -0400 Received: by mail-pa0-f46.google.com with SMTP id hz1so862247pad.19 for ; Sat, 20 Oct 2012 00:02:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:mime-version :content-type:content-transfer-encoding; bh=YOlBWW/VJ9jlHmo27upTF5++CmMdb69ouB81QECE+lc=; b=iQCmT2bUc/m2jx3zUtrzLpnhYSag6DS4PH604k+rWu/CMoBMNcFXUI/PivOFlpYCoW oKfsgWlWaSyXxlnjoz5ivC3Jk72OPzekBufCz+2hvbMcSJe51shcxt/wfSaT0XcLwHlD ixaWrdyPX8822JC0kRADkYzIVS4ItsZZIZ2WYft9gmEZDS+r61xNJgv2tB+9brUM2Y/h 70vmbhIkOq7V6y6FGcxK04IBhaiuGpUWL5AhMVc7+jnpVBpoA2Fe8lDYBpTbXEXpTVek K+sx90o2W+W5kaK29dWqquCLvV5yo92/9Cn+nMIzga3/oMRANoqCtWfFGxg+zYK7VqaT WDcg== Received: by 10.68.197.9 with SMTP id iq9mr12881384pbc.130.1350716556002; Sat, 20 Oct 2012 00:02:36 -0700 (PDT) Received: from localhost.localdomain ([122.166.13.141]) by mx.google.com with ESMTPS id vi9sm2437303pbc.41.2012.10.20.00.02.28 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 20 Oct 2012 00:02:35 -0700 (PDT) From: Prabhakar Lad To: LMML Cc: Manjunath Hadli , Mauro Carvalho Chehab , LKML , DLOS , "Lad, Prabhakar" Subject: [PATCH] media: davinci: vpbe: fix build warning Date: Sat, 20 Oct 2012 12:32:20 +0530 Message-Id: <1350716540-10638-1-git-send-email-prabhakar.lad@ti.com> X-Mailer: git-send-email 1.7.4.1 MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org From: Lad, Prabhakar Warnings were generated because of the following commit changed data type for address pointer 195bbca ARM: 7500/1: io: avoid writeback addressing modes for __raw_ accessors add __iomem annotation to fix following warnings drivers/media/platform/davinci/vpbe_osd.c: In function ‘osd_read’: drivers/media/platform/davinci/vpbe_osd.c:49:2: warning: passing argument 1 of ‘__raw_readl’ makes pointer from integer without a cast [enabled by default] arch/arm/include/asm/io.h:104:19: note: expected ‘const volatile void *’ but argument is of type ‘long unsigned int’ Signed-off-by: Lad, Prabhakar Signed-off-by: Manjunath Hadli --- drivers/media/platform/davinci/vpbe_osd.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/media/platform/davinci/vpbe_osd.c b/drivers/media/platform/davinci/vpbe_osd.c index bba299d..9ab9280 100644 --- a/drivers/media/platform/davinci/vpbe_osd.c +++ b/drivers/media/platform/davinci/vpbe_osd.c @@ -46,14 +46,14 @@ static inline u32 osd_read(struct osd_state *sd, u32 offset) { struct osd_state *osd = sd; - return readl(osd->osd_base + offset); + return readl(IOMEM(osd->osd_base + offset)); } static inline u32 osd_write(struct osd_state *sd, u32 val, u32 offset) { struct osd_state *osd = sd; - writel(val, osd->osd_base + offset); + writel(val, IOMEM(osd->osd_base + offset)); return val; } @@ -63,9 +63,9 @@ static inline u32 osd_set(struct osd_state *sd, u32 mask, u32 offset) struct osd_state *osd = sd; u32 addr = osd->osd_base + offset; - u32 val = readl(addr) | mask; + u32 val = readl(IOMEM(addr)) | mask; - writel(val, addr); + writel(val, IOMEM(addr)); return val; } @@ -75,9 +75,9 @@ static inline u32 osd_clear(struct osd_state *sd, u32 mask, u32 offset) struct osd_state *osd = sd; u32 addr = osd->osd_base + offset; - u32 val = readl(addr) & ~mask; + u32 val = readl(IOMEM(addr)) & ~mask; - writel(val, addr); + writel(val, IOMEM(addr)); return val; } @@ -88,9 +88,9 @@ static inline u32 osd_modify(struct osd_state *sd, u32 mask, u32 val, struct osd_state *osd = sd; u32 addr = osd->osd_base + offset; - u32 new_val = (readl(addr) & ~mask) | (val & mask); + u32 new_val = (readl(IOMEM(addr)) & ~mask) | (val & mask); - writel(new_val, addr); + writel(new_val, IOMEM(addr)); return new_val; }