On Mon, 2005-01-10 at 15:46 +0100, Herbert Valerio Riedel wrote:
> so this means, the mtd subsystem should use them and that the patch
> below is the way to fix it? (hoping it won't brake on other systems?)
sorry, wrong patch... the patch below should have s/__raw_/bus_/g
instead of s/__raw_//g;
anyway, are the bus_# memory accessors defined for all archs at all?
>
> Index: map.h
> ===================================================================
> RCS file: /home/cvs/linux/include/linux/mtd/map.h,v
> retrieving revision 1.12
> diff -u -r1.12 map.h
> --- map.h 25 Oct 2004 20:44:46 -0000 1.12
> +++ map.h 10 Jan 2005 14:45:00 -0000
> @@ -343,14 +343,14 @@
> map_word r;
>
> if (map_bankwidth_is_1(map))
> - r.x[0] = __raw_readb(map->virt + ofs);
> + r.x[0] = readb(map->virt + ofs);
> else if (map_bankwidth_is_2(map))
> - r.x[0] = __raw_readw(map->virt + ofs);
> + r.x[0] = readw(map->virt + ofs);
> else if (map_bankwidth_is_4(map))
> - r.x[0] = __raw_readl(map->virt + ofs);
> + r.x[0] = readl(map->virt + ofs);
> #if BITS_PER_LONG >= 64
> else if (map_bankwidth_is_8(map))
> - r.x[0] = __raw_readq(map->virt + ofs);
> + r.x[0] = readq(map->virt + ofs);
> #endif
> else if (map_bankwidth_is_large(map))
> memcpy_fromio(r.x, map->virt+ofs, map->bankwidth);
> @@ -361,14 +361,14 @@
> static inline void inline_map_write(struct map_info *map, const map_word
> datum, unsigned long ofs)
> {
> if (map_bankwidth_is_1(map))
> - __raw_writeb(datum.x[0], map->virt + ofs);
> + writeb(datum.x[0], map->virt + ofs);
> else if (map_bankwidth_is_2(map))
> - __raw_writew(datum.x[0], map->virt + ofs);
> + writew(datum.x[0], map->virt + ofs);
> else if (map_bankwidth_is_4(map))
> - __raw_writel(datum.x[0], map->virt + ofs);
> + writel(datum.x[0], map->virt + ofs);
> #if BITS_PER_LONG >= 64
> else if (map_bankwidth_is_8(map))
> - __raw_writeq(datum.x[0], map->virt + ofs);
> + writeq(datum.x[0], map->virt + ofs);
> #endif
> else if (map_bankwidth_is_large(map))
> memcpy_toio(map->virt+ofs, datum.x, map->bankwidth);
>
>
--
Herbert Valerio Riedel <hvr@inso.tuwien.ac.at>
|