From: Felipe Balbi <[EMAIL PROTECTED]>
avoid casting addresses, use the proper type.
Signed-off-by: Felipe Balbi <[EMAIL PROTECTED]>
---
drivers/video/davincifb.c | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/drivers/video/davincifb.c b/drivers/video/davincifb.c
index 49f86cc..0a0ae97 100644
--- a/drivers/video/davincifb.c
+++ b/drivers/video/davincifb.c
@@ -51,18 +51,18 @@
/*
* display controller register I/O routines
*/
-static __inline__ u32 dispc_reg_in(u32 offset)
+static __inline__ u32 dispc_reg_in(void __iomem *offset)
{
return (inl(offset));
}
-static __inline__ u32 dispc_reg_out(u32 offset, u32 val)
+static __inline__ u32 dispc_reg_out(void __iomem *offset, u32 val)
{
outl(val, offset);
return (val);
}
-static __inline__ u32 dispc_reg_merge(u32 offset, u32 val, u32 mask)
+static __inline__ u32 dispc_reg_merge(void __iomem *offset, u32 val, u32 mask)
{
- u32 addr = offset;
+ void __iomem *addr = offset;
u32 new_val = (inl(addr) & ~mask) | (val & mask);
outl(new_val, addr);
return (new_val);
@@ -105,7 +105,7 @@ static struct dm_info {
/* to map the registers */
dma_addr_t mmio_base_phys;
- unsigned long mmio_base;
+ void __iomem *mmio_base;
unsigned long mmio_size;
wait_queue_head_t vsync_wait;
@@ -1437,7 +1437,7 @@ static int davincifb_remove(struct platform_device *pdev)
dm->output_device_config(0);
if (dm->mmio_base)
- iounmap((void *)dm->mmio_base);
+ iounmap(dm->mmio_base);
release_mem_region(dm->mmio_base_phys, dm->mmio_size);
return 0;
@@ -1463,8 +1463,7 @@ static int davincifb_probe(struct platform_device *pdev)
}
/* map the regions */
- dm->mmio_base =
- (unsigned long)ioremap(dm->mmio_base_phys, dm->mmio_size);
+ dm->mmio_base = ioremap(dm->mmio_base_phys, dm->mmio_size);
if (!dm->mmio_base) {
dev_err(dm->dev, ": cannot map MMIO\n");
goto release_mmio;
--
1.6.0.4.617.g2baf1
_______________________________________________
Davinci-linux-open-source mailing list
[email protected]
http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source
