From: Michal Simek <michal.simek@xilinx.com>
To: linux-kernel@vger.kernel.org
Cc: Michal Simek <monstr@monstr.eu>,
Michal Simek <michal.simek@xilinx.com>,
Arnd Bergmann <arnd@arndb.de>, Timur Tabi <timur@tabi.org>,
Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>,
Tomi Valkeinen <tomi.valkeinen@ti.com>,
linux-fbdev@vger.kernel.org
Subject: [PATCH v3 7/8] video: xilinxfb: Fix sparse warnings
Date: Fri, 31 May 2013 12:55:37 +0000 [thread overview]
Message-ID: <ea3d6fcbb9f7a00a9cdbd3d0a7a4d3401265ebf0.1370004925.git.michal.simek@xilinx.com> (raw)
In-Reply-To: <cover.1370004925.git.michal.simek@xilinx.com>
[-- Attachment #1: Type: text/plain, Size: 3035 bytes --]
Use proper casting for fb_virt variable.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---
Changes in v3:
- New patch in this patchset
Changes in v2: None
drivers/video/xilinxfb.c | 24 ++++++++++++++----------
1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/drivers/video/xilinxfb.c b/drivers/video/xilinxfb.c
index f3d4a69..e27a4f6 100644
--- a/drivers/video/xilinxfb.c
+++ b/drivers/video/xilinxfb.c
@@ -131,7 +131,7 @@ struct xilinxfb_drvdata {
dcr_host_t dcr_host;
unsigned int dcr_len;
#endif
- void *fb_virt; /* virt. address of the frame buffer */
+ void __iomem *fb_virt; /* virt. address of the frame buffer */
dma_addr_t fb_phys; /* phys. address of the frame buffer */
int fb_alloced; /* Flag, was the fb memory alloced? */
@@ -273,8 +273,10 @@ static int xilinxfb_assign(struct platform_device *pdev,
drvdata->fb_virt = ioremap(pdata->fb_phys, fbsize);
} else {
drvdata->fb_alloced = 1;
- drvdata->fb_virt = dma_alloc_coherent(dev, PAGE_ALIGN(fbsize),
- &drvdata->fb_phys, GFP_KERNEL);
+ drvdata->fb_virt = (__force void __iomem *)
+ dma_alloc_coherent(dev, PAGE_ALIGN(fbsize),
+ &drvdata->fb_phys,
+ GFP_KERNEL);
}
if (!drvdata->fb_virt) {
@@ -287,7 +289,7 @@ static int xilinxfb_assign(struct platform_device *pdev,
}
/* Clear (turn to black) the framebuffer */
- memset_io((void __iomem *)drvdata->fb_virt, 0, fbsize);
+ memset_io(drvdata->fb_virt, 0, fbsize);
/* Tell the hardware where the frame buffer is */
xilinx_fb_out32(drvdata, REG_FB_ADDR, drvdata->fb_phys);
@@ -307,7 +309,7 @@ static int xilinxfb_assign(struct platform_device *pdev,
/* Fill struct fb_info */
drvdata->info.device = dev;
- drvdata->info.screen_base = (void __iomem *)drvdata->fb_virt;
+ drvdata->info.screen_base = drvdata->fb_virt;
drvdata->info.fbops = &xilinxfb_ops;
drvdata->info.fix = xilinx_fb_fix;
drvdata->info.fix.smem_start = drvdata->fb_phys;
@@ -341,8 +343,8 @@ static int xilinxfb_assign(struct platform_device *pdev,
if (drvdata->flags & BUS_ACCESS_FLAG) {
/* Put a banner in the log (for DEBUG) */
- dev_dbg(dev, "regs: phys=%x, virt=%p\n", drvdata->regs_phys,
- drvdata->regs);
+ dev_dbg(dev, "regs: phys=%x, virt=%p\n",
+ (u32)drvdata->regs_phys, drvdata->regs);
}
/* Put a banner in the log (for DEBUG) */
dev_dbg(dev, "fb: phys=%llx, virt=%p, size=%x\n",
@@ -355,8 +357,9 @@ err_regfb:
err_cmap:
if (drvdata->fb_alloced)
- dma_free_coherent(dev, PAGE_ALIGN(fbsize), drvdata->fb_virt,
- drvdata->fb_phys);
+ dma_free_coherent(dev, PAGE_ALIGN(fbsize),
+ (__force void *)drvdata->fb_virt,
+ drvdata->fb_phys);
else
iounmap(drvdata->fb_virt);
@@ -388,7 +391,8 @@ static int xilinxfb_release(struct device *dev)
if (drvdata->fb_alloced)
dma_free_coherent(dev, PAGE_ALIGN(drvdata->info.fix.smem_len),
- drvdata->fb_virt, drvdata->fb_phys);
+ (__force void *)drvdata->fb_virt,
+ drvdata->fb_phys);
else
iounmap(drvdata->fb_virt);
--
1.8.2.3
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
next prev parent reply other threads:[~2013-05-31 12:55 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-31 12:55 [PATCH v3 0/8] xilinxfb changes Michal Simek
[not found] ` <cover.1370004925.git.michal.simek-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org>
2013-05-31 12:55 ` [PATCH v3 1/8] video: xilinxfb: Fix OF probing on little-endian systems Michal Simek
2013-05-31 13:05 ` Timur Tabi
2013-05-31 13:09 ` Michal Simek
2013-05-31 12:55 ` [PATCH v3 2/8] video: xilinxfb: Do not name out_be32 in function name Michal Simek
2013-05-31 12:55 ` [PATCH v3 3/8] video: xilinxfb: Rename PLB_ACCESS_FLAG to BUS_ACCESS_FLAG Michal Simek
2013-05-31 12:55 ` [PATCH v3 4/8] video: xilinxfb: Use drvdata->regs_phys instead of physaddr Michal Simek
2013-05-31 12:55 ` [PATCH v3 5/8] video: xilinxfb: Group bus initialization Michal Simek
2013-05-31 12:55 ` [PATCH v3 6/8] video: xilinxfb: Add support for little endian accesses Michal Simek
2013-05-31 13:38 ` Arnd Bergmann
2013-05-31 12:55 ` Michal Simek [this message]
2013-05-31 13:26 ` [PATCH v3 7/8] video: xilinxfb: Fix sparse warnings Timur Tabi
2013-05-31 13:37 ` Michal Simek
2013-05-31 13:41 ` Timur Tabi
2013-05-31 14:22 ` Michal Simek
2013-05-31 14:56 ` Arnd Bergmann
2013-05-31 15:06 ` Timur Tabi
2013-05-31 15:29 ` Arnd Bergmann
2013-05-31 16:33 ` Michal Simek
2013-05-31 15:28 ` Arnd Bergmann
2013-05-31 12:55 ` [PATCH v3 8/8] video: xilinxfb: Use driver for Xilinx ARM Zynq Michal Simek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ea3d6fcbb9f7a00a9cdbd3d0a7a4d3401265ebf0.1370004925.git.michal.simek@xilinx.com \
--to=michal.simek@xilinx.com \
--cc=arnd@arndb.de \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=monstr@monstr.eu \
--cc=plagnioj@jcrosoft.com \
--cc=timur@tabi.org \
--cc=tomi.valkeinen@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).