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
/
chips
/
sharp.c
diff --git
a/drivers/mtd/chips/sharp.c
b/drivers/mtd/chips/sharp.c
index
36f61a6
..
c9cd3d2
100644
(file)
--- a/
drivers/mtd/chips/sharp.c
+++ b/
drivers/mtd/chips/sharp.c
@@
-64,7
+64,7
@@
#undef AUTOUNLOCK /* automatically unlocks blocks before erasing */
#undef AUTOUNLOCK /* automatically unlocks blocks before erasing */
-struct mtd_info *sharp_probe(struct map_info *);
+st
atic st
ruct mtd_info *sharp_probe(struct map_info *);
static int sharp_probe_map(struct map_info *map,struct mtd_info *mtd);
static int sharp_probe_map(struct map_info *map,struct mtd_info *mtd);
@@
-96,7
+96,6
@@
struct sharp_info{
struct flchip chips[1];
};
struct flchip chips[1];
};
-struct mtd_info *sharp_probe(struct map_info *map);
static void sharp_destroy(struct mtd_info *mtd);
static struct mtd_chip_driver sharp_chipdrv = {
static void sharp_destroy(struct mtd_info *mtd);
static struct mtd_chip_driver sharp_chipdrv = {
@@
-107,24
+106,22
@@
static struct mtd_chip_driver sharp_chipdrv = {
};
};
-struct mtd_info *sharp_probe(struct map_info *map)
+st
atic st
ruct mtd_info *sharp_probe(struct map_info *map)
{
struct mtd_info *mtd = NULL;
struct sharp_info *sharp = NULL;
int width;
{
struct mtd_info *mtd = NULL;
struct sharp_info *sharp = NULL;
int width;
- mtd = k
m
alloc(sizeof(*mtd), GFP_KERNEL);
+ mtd = k
z
alloc(sizeof(*mtd), GFP_KERNEL);
if(!mtd)
return NULL;
if(!mtd)
return NULL;
- sharp = k
m
alloc(sizeof(*sharp), GFP_KERNEL);
+ sharp = k
z
alloc(sizeof(*sharp), GFP_KERNEL);
if(!sharp) {
kfree(mtd);
return NULL;
}
if(!sharp) {
kfree(mtd);
return NULL;
}
- memset(mtd, 0, sizeof(*mtd));
-
width = sharp_probe_map(map,mtd);
if(!width){
kfree(mtd);
width = sharp_probe_map(map,mtd);
if(!width){
kfree(mtd);
@@
-141,9
+138,9
@@
struct mtd_info *sharp_probe(struct map_info *map)
mtd->suspend = sharp_suspend;
mtd->resume = sharp_resume;
mtd->flags = MTD_CAP_NORFLASH;
mtd->suspend = sharp_suspend;
mtd->resume = sharp_resume;
mtd->flags = MTD_CAP_NORFLASH;
+ mtd->writesize = 1;
mtd->name = map->name;
mtd->name = map->name;
- memset(sharp, 0, sizeof(*sharp));
sharp->chipshift = 23;
sharp->numchips = 1;
sharp->chips[0].start = 0;
sharp->chipshift = 23;
sharp->numchips = 1;
sharp->chips[0].start = 0;
@@
-581,7
+578,7
@@
static void sharp_destroy(struct mtd_info *mtd)
}
}
-int __init sharp_probe_init(void)
+
static
int __init sharp_probe_init(void)
{
printk("MTD Sharp chip driver <ds@lineo.com>\n");
{
printk("MTD Sharp chip driver <ds@lineo.com>\n");