projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
yaffs: Clean up as per Ryan's comments
[yaffs2.git]
/
yaffs_nand.c
diff --git
a/yaffs_nand.c
b/yaffs_nand.c
index 84ab0f020edbddfaf031bbd140a92b75520bf8ef..a1fe5c4bb1f657420aeddda609d96ff0e1e9be20 100644
(file)
--- a/
yaffs_nand.c
+++ b/
yaffs_nand.c
@@
-18,16
+18,15
@@
#include "yaffs_getblockinfo.h"
int yaffs_rd_chunk_tags_nand(struct yaffs_dev *dev, int nand_chunk,
#include "yaffs_getblockinfo.h"
int yaffs_rd_chunk_tags_nand(struct yaffs_dev *dev, int nand_chunk,
- u8 *
buffer, struct yaffs_ext_tags *tags)
+ u8 *buffer, struct yaffs_ext_tags *tags)
{
int result;
struct yaffs_ext_tags local_tags;
{
int result;
struct yaffs_ext_tags local_tags;
-
int realigned_chunk = nand_chunk - dev->chunk_offset;
dev->n_page_reads++;
int realigned_chunk = nand_chunk - dev->chunk_offset;
dev->n_page_reads++;
- /* If there are no tags provided
, use local tags to get prioritised gc working
*/
+ /* If there are no tags provided
use local tags.
*/
if (!tags)
tags = &local_tags;
if (!tags)
tags = &local_tags;
@@
-46,65
+45,60
@@
int yaffs_rd_chunk_tags_nand(struct yaffs_dev *dev, int nand_chunk,
dev->param.chunks_per_block);
yaffs_handle_chunk_error(dev, bi);
}
dev->param.chunks_per_block);
yaffs_handle_chunk_error(dev, bi);
}
-
return result;
}
int yaffs_wr_chunk_tags_nand(struct yaffs_dev *dev,
return result;
}
int yaffs_wr_chunk_tags_nand(struct yaffs_dev *dev,
- int nand_chunk,
-
const u8 *
buffer, struct yaffs_ext_tags *tags)
+
int nand_chunk,
+
const u8 *
buffer, struct yaffs_ext_tags *tags)
{
{
-
dev->n_page_writes++;
dev->n_page_writes++;
-
nand_chunk -= dev->chunk_offset;
if (tags) {
tags->seq_number = dev->seq_number;
tags->chunk_used = 1;
if (!yaffs_validate_tags(tags)) {
nand_chunk -= dev->chunk_offset;
if (tags) {
tags->seq_number = dev->seq_number;
tags->chunk_used = 1;
if (!yaffs_validate_tags(tags)) {
-
T
(YAFFS_TRACE_ERROR,
-
(TSTR("Writing uninitialised tags" TENDSTR))
);
-
Y
BUG();
+
yaffs_trace
(YAFFS_TRACE_ERROR,
+
"Writing uninitialised tags"
);
+ BUG();
}
}
-
T
(YAFFS_TRACE_WRITE,
-
(TSTR("Writing chunk %d tags %d %d" TENDSTR), nand_chunk
,
-
tags->obj_id, tags->chunk_id)
);
+
yaffs_trace
(YAFFS_TRACE_WRITE,
+
"Writing chunk %d tags %d %d"
,
+
nand_chunk, tags->obj_id, tags->chunk_id
);
} else {
} else {
- T(YAFFS_TRACE_ERROR, (TSTR("Writing with no tags" TENDSTR)));
- YBUG();
+ yaffs_trace(YAFFS_TRACE_ERROR, "Writing with no tags");
+ BUG();
+ return YAFFS_FAIL;
}
if (dev->param.write_chunk_tags_fn)
return dev->param.write_chunk_tags_fn(dev, nand_chunk, buffer,
}
if (dev->param.write_chunk_tags_fn)
return dev->param.write_chunk_tags_fn(dev, nand_chunk, buffer,
- tags);
- else
-
return yaffs_tags_compat_wr(dev, nand_chunk, buffer, tags);
+
tags);
+
+ return yaffs_tags_compat_wr(dev, nand_chunk, buffer, tags);
}
int yaffs_mark_bad(struct yaffs_dev *dev, int block_no)
{
block_no -= dev->block_offset;
}
int yaffs_mark_bad(struct yaffs_dev *dev, int block_no)
{
block_no -= dev->block_offset;
-
if (dev->param.bad_block_fn)
return dev->param.bad_block_fn(dev, block_no);
if (dev->param.bad_block_fn)
return dev->param.bad_block_fn(dev, block_no);
- else
-
return yaffs_tags_compat_mark_bad(dev, block_no);
+
+ return yaffs_tags_compat_mark_bad(dev, block_no);
}
int yaffs_query_init_block_state(struct yaffs_dev *dev,
int block_no,
enum yaffs_block_state *state,
}
int yaffs_query_init_block_state(struct yaffs_dev *dev,
int block_no,
enum yaffs_block_state *state,
- u32 *
seq_number)
+ u32 *seq_number)
{
block_no -= dev->block_offset;
{
block_no -= dev->block_offset;
-
if (dev->param.query_block_fn)
return dev->param.query_block_fn(dev, block_no, state,
seq_number);
if (dev->param.query_block_fn)
return dev->param.query_block_fn(dev, block_no, state,
seq_number);
- else
- return yaffs_tags_compat_query_block(dev, block_no,
- state, seq_number);
+
+ return yaffs_tags_compat_query_block(dev, block_no, state, seq_number);
}
int yaffs_erase_block(struct yaffs_dev *dev, int flash_block)
}
int yaffs_erase_block(struct yaffs_dev *dev, int flash_block)
@@
-112,11
+106,8
@@
int yaffs_erase_block(struct yaffs_dev *dev, int flash_block)
int result;
flash_block -= dev->block_offset;
int result;
flash_block -= dev->block_offset;
-
dev->n_erasures++;
dev->n_erasures++;
-
result = dev->param.erase_fn(dev, flash_block);
result = dev->param.erase_fn(dev, flash_block);
-
return result;
}
return result;
}