projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://www.aleph1.co.uk/home/aleph1/git/yaffs2
[yaffs2.git]
/
yaffs_mtdif.c
diff --git
a/yaffs_mtdif.c
b/yaffs_mtdif.c
index 4fd89943eebabed9a5e141016b8c1563a2eea287..edc152575302e72a2339e58a730e57e40e028bcc 100644
(file)
--- a/
yaffs_mtdif.c
+++ b/
yaffs_mtdif.c
@@
-1,7
+1,7
@@
/*
* YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
*
/*
* YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
*
- * Copyright (C) 2002-201
0
Aleph One Ltd.
+ * Copyright (C) 2002-201
1
Aleph One Ltd.
* for Toby Churchill Ltd and Brightstar Engineering
*
* Created by Charles Manning <charles@aleph1.co.uk>
* for Toby Churchill Ltd and Brightstar Engineering
*
* Created by Charles Manning <charles@aleph1.co.uk>
@@
-13,7
+13,6
@@
#include "yportenv.h"
#include "yportenv.h"
-
#include "yaffs_mtdif.h"
#include "linux/mtd/mtd.h"
#include "yaffs_mtdif.h"
#include "linux/mtd/mtd.h"
@@
-23,14
+22,13
@@
#include "yaffs_linux.h"
#include "yaffs_linux.h"
-int nandmtd_erase_block(
yaffs_dev_t
*dev, int block_no)
+int nandmtd_erase_block(
struct yaffs_dev
*dev, int block_no)
{
struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
{
struct mtd_info *mtd = yaffs_dev_to_mtd(dev);
-
__
u32 addr =
- ((loff_t) block_no) * dev->param.total_bytes_per_chunk
-
*
dev->param.chunks_per_block;
+ u32 addr =
+ ((loff_t) block_no) * dev->param.total_bytes_per_chunk
*
+ dev->param.chunks_per_block;
struct erase_info ei;
struct erase_info ei;
-
int retval = 0;
ei.mtd = mtd;
int retval = 0;
ei.mtd = mtd;
@@
-45,12
+43,11
@@
int nandmtd_erase_block(yaffs_dev_t *dev, int block_no)
if (retval == 0)
return YAFFS_OK;
if (retval == 0)
return YAFFS_OK;
- else
-
return YAFFS_FAIL;
+
+ return YAFFS_FAIL;
}
}
-int nandmtd_initialise(
yaffs_dev_t
*dev)
+int nandmtd_initialise(
struct yaffs_dev
*dev)
{
return YAFFS_OK;
}
{
return YAFFS_OK;
}
-