From patchwork Mon Oct 22 12:17:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Lad, Prabhakar" X-Patchwork-Id: 1625481 Return-Path: X-Original-To: patchwork-davinci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from arroyo.ext.ti.com (arroyo.ext.ti.com [192.94.94.40]) by patchwork1.kernel.org (Postfix) with ESMTP id 07DDE400E8 for ; Mon, 22 Oct 2012 12:19:54 +0000 (UTC) Received: from dlelxv30.itg.ti.com ([172.17.2.17]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id q9MCIDed029774; Mon, 22 Oct 2012 07:18:13 -0500 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dlelxv30.itg.ti.com (8.13.8/8.13.8) with ESMTP id q9MCIDAl023077; Mon, 22 Oct 2012 07:18:13 -0500 Received: from dlelxv23.itg.ti.com (172.17.1.198) by dfle72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.1.323.3; Mon, 22 Oct 2012 07:18:13 -0500 Received: from linux.omap.com (dlelxs01.itg.ti.com [157.170.227.31]) by dlelxv23.itg.ti.com (8.13.8/8.13.8) with ESMTP id q9MCIChT005794; Mon, 22 Oct 2012 07:18:12 -0500 Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id 8379380627; Mon, 22 Oct 2012 07:18:12 -0500 (CDT) X-Original-To: davinci-linux-open-source@linux.davincidsp.com Delivered-To: davinci-linux-open-source@linux.davincidsp.com Received: from dflp52.itg.ti.com (dflp52.itg.ti.com [128.247.22.96]) by linux.omap.com (Postfix) with ESMTP id 1C08B80626 for ; Mon, 22 Oct 2012 07:18:11 -0500 (CDT) Received: from medina.ext.ti.com (medina.ext.ti.com [192.91.81.31]) by dflp52.itg.ti.com (8.13.7/8.13.8) with ESMTP id q9MCIA8a007825 for ; Mon, 22 Oct 2012 07:18:10 -0500 (CDT) Received: from psmtp.com (na3sys009amx202.postini.com [74.125.149.42]) by medina.ext.ti.com (8.13.7/8.13.7) with SMTP id q9MCI9YN009113 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Mon, 22 Oct 2012 07:18:09 -0500 Received: from mail-da0-f45.google.com ([209.85.210.45]) (using TLSv1) by na3sys009amx202.postini.com ([74.125.148.10]) with SMTP; Mon, 22 Oct 2012 05:18:09 PDT Received: by mail-da0-f45.google.com with SMTP id n15so1293203dad.4 for ; Mon, 22 Oct 2012 05:18:09 -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=FbYI2YtcBCJQav9i+mpIcsjae7MQIJSG65auPmIfORY=; b=HxIRqiJkk5M0h8ruWxY16LNAxWrY1zBe1ptkqT0dOLHF0duucUyD9thpJ9MdVhAFuZ sn5sUCMRBCEzmn4tZhg4qtpX/EpN6Yaf6oFEsXG8fyk9+QsXUqFhutT50Fammxz0IKsI 4lLvkPnUvr4xmVq87Jn+wGdjlvldeVqU5rafk7DFJhklbLwmFNmFmFuHPFtac+KFCUPT Txy3Wfv06ldIz7nH0JoCValmiF/zkXZpXThiHVGQJDRlh/B4VXbZXyN1X7pN/ZGACPnb aHuFWCl0qvTZzWvHrr7wY652gUEBf0okIz/tXn/Hxwv51Gc2vLytVU61f4c5oirt0gkT /nkQ== Received: by 10.68.190.197 with SMTP id gs5mr29757506pbc.124.1350908288968; Mon, 22 Oct 2012 05:18:08 -0700 (PDT) Received: from localhost.localdomain ([122.166.13.141]) by mx.google.com with ESMTPS id pw2sm5864937pbb.59.2012.10.22.05.18.03 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 22 Oct 2012 05:18:07 -0700 (PDT) From: Prabhakar Lad To: LMML Subject: [PATCH RESEND] media: davinci: vpbe: fix build warning Date: Mon, 22 Oct 2012 17:47:51 +0530 Message-ID: <1350908271-11448-1-git-send-email-prabhakar.lad@ti.com> X-Mailer: git-send-email 1.7.4.1 MIME-Version: 1.0 X-pstn-neptune: 0/0/0.00/0 X-pstn-levels: (S: 8.74618/99.90000 CV:99.9000 FC:95.5390 LC:95.5390 R:95.9108 P:95.9108 M:97.0282 C:98.6951 ) X-pstn-dkim: 1 skipped:not-enabled X-pstn-settings: 2 (0.5000:0.0050) s cv GT3 gt2 gt1 r p m c X-pstn-addresses: from [82/3] CC: DLOS , LKML X-BeenThere: davinci-linux-open-source@linux.davincidsp.com X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: Errors-To: davinci-linux-open-source-bounces@linux.davincidsp.com 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 --- Resending the patch since, it didn't reach the DLOS mailing list. 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; }