From: marty Date: Sun, 31 Jul 2005 04:08:08 +0000 (+0000) Subject: applied patch 13-sparse-fix--make-some-symbol-static.diff X-Git-Tag: pre-name-change~444 X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=commitdiff_plain;h=60cbacc6973295a28491aa4964d0141cc0b6cb27;ds=sidebyside applied patch 13-sparse-fix--make-some-symbol-static.diff --- diff --git a/mtdemul/nandemul2k.c b/mtdemul/nandemul2k.c index e5217b0..eef68dd 100644 --- a/mtdemul/nandemul2k.c +++ b/mtdemul/nandemul2k.c @@ -253,7 +253,7 @@ int nandemul2k_GetNumberOfBlocks(void) {return nandemul2k_CalcNBlocks();} -int nandemul2k_ReadId(__u8 *vendorId, __u8 *deviceId) +static int nandemul2k_ReadId(__u8 *vendorId, __u8 *deviceId) { *vendorId = 'Y'; *deviceId = '2'; @@ -262,7 +262,7 @@ int nandemul2k_ReadId(__u8 *vendorId, __u8 *deviceId) } -int nandemul2k_ReadStatus(__u8 *status) +static int nandemul2k_ReadStatus(__u8 *status) { *status = 0; return 1; diff --git a/yaffs_fs.c b/yaffs_fs.c index 68f28aa..344e325 100644 --- a/yaffs_fs.c +++ b/yaffs_fs.c @@ -30,11 +30,10 @@ */ -const char *yaffs_fs_c_version = "$Id: yaffs_fs.c,v 1.16 2005-07-31 03:58:17 marty Exp $"; +const char *yaffs_fs_c_version = "$Id: yaffs_fs.c,v 1.17 2005-07-31 04:08:08 marty Exp $"; extern const char *yaffs_guts_c_version; - #include #include #include @@ -192,7 +191,7 @@ static struct inode_operations yaffs_file_inode_operations = { .setattr = yaffs_setattr, }; -struct inode_operations yaffs_symlink_inode_operations = { +static struct inode_operations yaffs_symlink_inode_operations = { .readlink = yaffs_readlink, .follow_link = yaffs_follow_link, .setattr = yaffs_setattr, diff --git a/yaffs_mtdif.c b/yaffs_mtdif.c index 8260f03..69d58fb 100644 --- a/yaffs_mtdif.c +++ b/yaffs_mtdif.c @@ -13,7 +13,7 @@ * */ -const char *yaffs_mtdif_c_version = "$Id: yaffs_mtdif.c,v 1.3 2005-07-31 04:05:14 marty Exp $"; +const char *yaffs_mtdif_c_version = "$Id: yaffs_mtdif.c,v 1.4 2005-07-31 04:08:08 marty Exp $"; #ifdef CONFIG_YAFFS_MTD_ENABLED @@ -29,12 +29,12 @@ const char *yaffs_mtdif_c_version = "$Id: yaffs_mtdif.c,v 1.3 2005-07-31 04:05:1 #include "linux/mtd/nand.h" #endif -struct nand_oobinfo yaffs_oobinfo = { +static struct nand_oobinfo yaffs_oobinfo = { .useecc = 1, .eccpos = {8, 9, 10, 13, 14, 15} }; -struct nand_oobinfo yaffs_noeccinfo = { +static struct nand_oobinfo yaffs_noeccinfo = { .useecc = 0, }; diff --git a/yaffs_ramem.c b/yaffs_ramem.c index f416616..21c936f 100644 --- a/yaffs_ramem.c +++ b/yaffs_ramem.c @@ -15,7 +15,7 @@ //yaffs_ramem.c // Since this creates the RAM block at start up it is pretty useless for testing the scanner. -const char *yaffs_ramem_c_version = "$Id: yaffs_ramem.c,v 1.3 2005-07-29 19:57:38 luc Exp $"; +const char *yaffs_ramem_c_version = "$Id: yaffs_ramem.c,v 1.4 2005-07-31 04:08:08 marty Exp $"; #ifndef __KERNEL__ #define CONFIG_YAFFS_RAM_ENABLED @@ -100,7 +100,7 @@ static void nandemul_ReallyEraseBlock(int blockNumber) } -int nandemul_CalcNBlocks(void) +static int nandemul_CalcNBlocks(void) { switch(sizeInMB) { @@ -259,7 +259,7 @@ int nandemul_ReadChunkFromNAND(yaffs_Device *dev,int chunkInNAND, __u8 *data, ya } -int nandemul_CheckChunkErased(yaffs_Device *dev,int chunkInNAND) +static int nandemul_CheckChunkErased(yaffs_Device *dev,int chunkInNAND) { int blk; int pg; diff --git a/yaffs_ramem2k.c b/yaffs_ramem2k.c index f32afe5..2b05e98 100644 --- a/yaffs_ramem2k.c +++ b/yaffs_ramem2k.c @@ -15,7 +15,7 @@ //yaffs_ramem2k.c: RAM emulation in-kernel for 2K pages (YAFFS2) -const char *yaffs_ramem2k_c_version = "$Id: yaffs_ramem2k.c,v 1.3 2005-07-29 19:57:38 luc Exp $"; +const char *yaffs_ramem2k_c_version = "$Id: yaffs_ramem2k.c,v 1.4 2005-07-31 04:08:08 marty Exp $"; #ifndef __KERNEL__ #define CONFIG_YAFFS_RAM_ENABLED @@ -262,7 +262,7 @@ int nandemul2k_ReadChunkWithTagsFromNAND(yaffs_Device *dev,int chunkInNAND, __u8 } -int nandemul2k_CheckChunkErased(yaffs_Device *dev,int chunkInNAND) +static int nandemul2k_CheckChunkErased(yaffs_Device *dev,int chunkInNAND) { int blk; int pg;