X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_checkptrw.c;h=b1c4beed2b854a7a0bbff25ff3e5657875d769b0;hp=8478eb88185fc4e1b271f161f31062e1f84bffb4;hb=9c99932eb16ba64c6d3ba69145fe8c5d5b04274d;hpb=4b745e6080b0e0283e1e2f1de044760a8245e227

diff --git a/yaffs_checkptrw.c b/yaffs_checkptrw.c
index 8478eb8..b1c4bee 100644
--- a/yaffs_checkptrw.c
+++ b/yaffs_checkptrw.c
@@ -74,7 +74,7 @@ static int yaffs_checkpt_erase(struct yaffs_dev *dev)
 {
 	int i;
 
-	if (!dev->param.erase_fn)
+	if (!dev->param.drv_erase_fn)
 		return 0;
 	yaffs_trace(YAFFS_TRACE_CHECKPOINT,
 		"checking blocks %d to %d",
@@ -91,14 +91,14 @@ static int yaffs_checkpt_erase(struct yaffs_dev *dev)
 
 			dev->n_erasures++;
 
-			result = dev->param.erase_fn(dev, offset_i);
+			result = dev->param.drv_erase_fn(dev, offset_i);
 			if(result) {
 				bi->block_state = YAFFS_BLOCK_STATE_EMPTY;
 				dev->n_erased_blocks++;
 				dev->n_free_chunks +=
 				    dev->param.chunks_per_block;
 			} else {
-				dev->param.bad_block_fn(dev, offset_i);
+				dev->param.drv_bad_block_fn(dev, offset_i);
 				bi->block_state = YAFFS_BLOCK_STATE_DEAD;
 			}
 		}
@@ -202,7 +202,8 @@ int yaffs2_checkpt_open(struct yaffs_dev *dev, int writing)
 	/* Got the functions we need? */
 	if (!dev->param.write_chunk_tags_fn ||
 	    !dev->param.read_chunk_tags_fn ||
-	    !dev->param.erase_fn || !dev->param.bad_block_fn)
+	    !dev->param.drv_erase_fn ||
+	    !dev->param.drv_mark_bad_fn)
 		return 0;
 
 	if (writing && !yaffs2_checkpt_space_ok(dev))