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.5.x5
[linux-2.6.git]
/
drivers
/
mtd
/
maps
/
sun_uflash.c
diff --git
a/drivers/mtd/maps/sun_uflash.c
b/drivers/mtd/maps/sun_uflash.c
index
2a9932c
..
29091d1
100644
(file)
--- a/
drivers/mtd/maps/sun_uflash.c
+++ b/
drivers/mtd/maps/sun_uflash.c
@@
-1,4
+1,4
@@
-/* $Id: sun_uflash.c,v 1.
9 2004/07/12 21:59:45 dwmw2
Exp $
+/* $Id: sun_uflash.c,v 1.
11 2004/11/04 13:24:15 gleixner
Exp $
*
* sun_uflash - Driver implementation for user-programmable flash
* present on many Sun Microsystems SME boardsets.
*
* sun_uflash - Driver implementation for user-programmable flash
* present on many Sun Microsystems SME boardsets.
@@
-96,8
+96,7
@@
int uflash_devinit(struct linux_ebus_device* edev)
pdev->map.name = pdev->name;
}
pdev->map.phys = edev->resource[0].start;
pdev->map.name = pdev->name;
}
pdev->map.phys = edev->resource[0].start;
- pdev->map.virt =
- (unsigned long)ioremap_nocache(edev->resource[0].start, pdev->map.size);
+ pdev->map.virt = ioremap_nocache(edev->resource[0].start, pdev->map.size);
if(0 == pdev->map.virt) {
printk("%s: failed to map device\n", __FUNCTION__);
kfree(pdev->name);
if(0 == pdev->map.virt) {
printk("%s: failed to map device\n", __FUNCTION__);
kfree(pdev->name);
@@
-110,7
+109,7
@@
int uflash_devinit(struct linux_ebus_device* edev)
/* MTD registration */
pdev->mtd = do_map_probe("cfi_probe", &pdev->map);
if(0 == pdev->mtd) {
/* MTD registration */
pdev->mtd = do_map_probe("cfi_probe", &pdev->map);
if(0 == pdev->mtd) {
- iounmap(
(void *)
pdev->map.virt);
+ iounmap(pdev->map.virt);
kfree(pdev->name);
kfree(pdev);
return(-ENXIO);
kfree(pdev->name);
kfree(pdev);
return(-ENXIO);
@@
-164,8
+163,8
@@
static void __exit uflash_cleanup(void)
map_destroy(udev->mtd);
}
if(0 != udev->map.virt) {
map_destroy(udev->mtd);
}
if(0 != udev->map.virt) {
- iounmap(
(void*)
udev->map.virt);
- udev->map.virt =
0
;
+ iounmap(udev->map.virt);
+ udev->map.virt =
NULL
;
}
if(0 != udev->name) {
kfree(udev->name);
}
if(0 != udev->name) {
kfree(udev->name);