git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.3
[linux-2.6.git]
/
drivers
/
mtd
/
maps
/
uclinux.c
diff --git
a/drivers/mtd/maps/uclinux.c
b/drivers/mtd/maps/uclinux.c
index
44d13f5
..
baff49b
100644
(file)
--- a/
drivers/mtd/maps/uclinux.c
+++ b/
drivers/mtd/maps/uclinux.c
@@
-5,7
+5,7
@@
*
* (C) Copyright 2002, Greg Ungerer (gerg@snapgear.com)
*
*
* (C) Copyright 2002, Greg Ungerer (gerg@snapgear.com)
*
- * $Id: uclinux.c,v 1.
5 2003/05/20 20:59:32
dwmw2 Exp $
+ * $Id: uclinux.c,v 1.
7 2004/07/12 21:59:45
dwmw2 Exp $
*/
/****************************************************************************/
*/
/****************************************************************************/
@@
-64,15
+64,14
@@
int __init uclinux_mtd_init(void)
mapp = &uclinux_ram_map;
mapp->phys = (unsigned long) &_ebss;
mapp->size = PAGE_ALIGN(*((unsigned long *)((&_ebss) + 8)));
mapp = &uclinux_ram_map;
mapp->phys = (unsigned long) &_ebss;
mapp->size = PAGE_ALIGN(*((unsigned long *)((&_ebss) + 8)));
- mapp->b
us
width = 4;
+ mapp->b
ank
width = 4;
printk("uclinux[mtd]: RAM probe address=0x%x size=0x%x\n",
(int) mapp->map_priv_2, (int) mapp->size);
printk("uclinux[mtd]: RAM probe address=0x%x size=0x%x\n",
(int) mapp->map_priv_2, (int) mapp->size);
- mapp->virt = (unsigned long)
- ioremap_nocache(mapp->phys, mapp->size);
+ mapp->virt = ioremap_nocache(mapp->phys, mapp->size);
- if (
mapp->virt == 0
) {
+ if (
!mapp->virt
) {
printk("uclinux[mtd]: ioremap_nocache() failed\n");
return(-EIO);
}
printk("uclinux[mtd]: ioremap_nocache() failed\n");
return(-EIO);
}
@@
-82,7
+81,7
@@
int __init uclinux_mtd_init(void)
mtd = do_map_probe("map_ram", mapp);
if (!mtd) {
printk("uclinux[mtd]: failed to find a mapping?\n");
mtd = do_map_probe("map_ram", mapp);
if (!mtd) {
printk("uclinux[mtd]: failed to find a mapping?\n");
- iounmap(
(void *)
mapp->virt);
+ iounmap(mapp->virt);
return(-ENXIO);
}
return(-ENXIO);
}