2005-10-28 07:00:34

by John Bowler

[permalink] [raw]
Subject: [PATCH] 2.6.14 drivers/mtd/maps/ixp4xx.c: remove compiler warning from ioremap assignment

Trivial fix for a compiler warning: info->map.map_priv_1 is
(unsigned long), ioremap returns a pointer. (Probably the
result of improved compiler warnings in >2.6.12).

Signed-off-by: John Bowler <[email protected]>

--- linux-2.6.14-rc5/drivers/mtd/maps/ixp4xx.c 2005-10-26 08:37:21.960361430 -0700
+++ patched/drivers/mtd/maps/ixp4xx.c 2005-10-26 12:13:13.879374310 -0700
@@ -227,7 +227,7 @@ static int ixp4xx_flash_probe(struct dev
goto Error;
}

- info->map.map_priv_1 = ioremap(dev->resource->start,
+ info->map.map_priv_1 = (unsigned long)ioremap(dev->resource->start,
dev->resource->end - dev->resource->start + 1);
if (!info->map.map_priv_1) {
printk(KERN_ERR "IXP4XXFlash: Failed to ioremap region\n");


2005-10-28 07:55:19

by Russell King

[permalink] [raw]
Subject: Re: [PATCH] 2.6.14 drivers/mtd/maps/ixp4xx.c: remove compiler warning from ioremap assignment

On Thu, Oct 27, 2005 at 11:13:59PM -0700, John Bowler wrote:
> Trivial fix for a compiler warning: info->map.map_priv_1 is
> (unsigned long), ioremap returns a pointer. (Probably the
> result of improved compiler warnings in >2.6.12).

This is wrong. You should be using map.virt (which has the correct
type) and not map.map_priv_1.

--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of: 2.6 Serial core