yaffs: Remove a whole lot of function wrappers and forward declarations

[yaffs2.git] / direct / yaffs_nandif.c

diff --git a/direct/yaffs_nandif.c b/direct/yaffs_nandif.c
index 0e2c14abc1db0d20ff8c3815e5e1c181bb06c46f..f2806e1940acdc98787625f42e6dd5647792dc7b 100644 (file)
--- a/direct/yaffs_nandif.c
+++ b/direct/yaffs_nandif.c
@@ -13,7 +13,6 @@
 
 #include "yportenv.h"
 #include "yaffs_guts.h"
-#include "devextras.h"
 
 
 #include "yaffs_nandif.h"
@@ -216,12 +215,12 @@ struct yaffs_dev *
        yaffs_add_dev_from_geometry(const YCHAR *name,
                                        const ynandif_Geometry *geometry)
 {
-       YCHAR *clonedName = YMALLOC(sizeof(YCHAR) * (yaffs_strnlen(name,YAFFS_MAX_NAME_LENGTH)+1));
-       struct yaffs_dev *dev = YMALLOC(sizeof(struct yaffs_dev));
+       YCHAR *clonedName = malloc(sizeof(YCHAR) * (strnlen(name,YAFFS_MAX_NAME_LENGTH)+1));
+       struct yaffs_dev *dev = malloc(sizeof(struct yaffs_dev));
 
        if(dev && clonedName){
                memset(dev,0,sizeof(struct yaffs_dev));
-               yaffs_strcpy(clonedName,name);
+               strcpy(clonedName,name);
 
                dev->param.name = clonedName;
                dev->param.write_chunk_tags_fn  = ynandif_WriteChunkWithTagsToNAND;
@@ -248,9 +247,9 @@ struct yaffs_dev *
        }
 
        if(dev)
-               YFREE(dev);
+               free(dev);
        if(clonedName)
-               YFREE(clonedName);
+               free(clonedName);
 
        return NULL;
 }