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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
mtd
/
maps
/
ocotea.c
diff --git
a/drivers/mtd/maps/ocotea.c
b/drivers/mtd/maps/ocotea.c
index
c223514
..
5522eac
100644
(file)
--- a/
drivers/mtd/maps/ocotea.c
+++ b/
drivers/mtd/maps/ocotea.c
@@
-18,7
+18,6
@@
#include <linux/mtd/mtd.h>
#include <linux/mtd/map.h>
#include <linux/mtd/partitions.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/map.h>
#include <linux/mtd/partitions.h>
-#include <linux/config.h>
#include <asm/io.h>
#include <asm/ibm44x.h>
#include <platforms/4xx/ocotea.h>
#include <asm/io.h>
#include <asm/ibm44x.h>
#include <platforms/4xx/ocotea.h>
@@
-58,8
+57,6
@@
static struct mtd_partition ocotea_large_partitions[] = {
}
};
}
};
-#define NB_OF(x) (sizeof(x)/sizeof(x[0]))
-
int __init init_ocotea(void)
{
u8 fpga0_reg;
int __init init_ocotea(void)
{
u8 fpga0_reg;
@@
-97,9
+94,10
@@
int __init init_ocotea(void)
if (flash) {
flash->owner = THIS_MODULE;
add_mtd_partitions(flash, ocotea_small_partitions,
if (flash) {
flash->owner = THIS_MODULE;
add_mtd_partitions(flash, ocotea_small_partitions,
-
NB_OF
(ocotea_small_partitions));
+
ARRAY_SIZE
(ocotea_small_partitions));
} else {
printk("map probe failed for flash\n");
} else {
printk("map probe failed for flash\n");
+ iounmap(ocotea_small_map.virt);
return -ENXIO;
}
return -ENXIO;
}
@@
-109,6
+107,7
@@
int __init init_ocotea(void)
if (!ocotea_large_map.virt) {
printk("Failed to ioremap flash\n");
if (!ocotea_large_map.virt) {
printk("Failed to ioremap flash\n");
+ iounmap(ocotea_small_map.virt);
return -EIO;
}
return -EIO;
}
@@
-118,9
+117,11
@@
int __init init_ocotea(void)
if (flash) {
flash->owner = THIS_MODULE;
add_mtd_partitions(flash, ocotea_large_partitions,
if (flash) {
flash->owner = THIS_MODULE;
add_mtd_partitions(flash, ocotea_large_partitions,
-
NB_OF
(ocotea_large_partitions));
+
ARRAY_SIZE
(ocotea_large_partitions));
} else {
printk("map probe failed for flash\n");
} else {
printk("map probe failed for flash\n");
+ iounmap(ocotea_small_map.virt);
+ iounmap(ocotea_large_map.virt);
return -ENXIO;
}
return -ENXIO;
}