brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-06-09 23:36:03 +09:00
Code Issues Projects Releases Wiki Activity

fs: use get_nand_dev_by_index()

Browse Source 
As part of preparation for nand DM conversion the new API has been
introduced to remove direct access to nand_info array. So, use it here
instead of accessing to nand_info array directly.

Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
This commit is contained in:
Grygorii Strashko 2017-06-26 19:12:57 -05:00 committed by Tom Rini
parent edba8cc4f3
commit eb6a5c3c02
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fs/jffs2/jffs2_1pass.c
View File

@ -175,10 +175,15 @@ static u32 nand_cache_off = (u32)-1;
static int read_nand_cached(u32 off, u32 size, u_char *buf) static int read_nand_cached(u32 off, u32 size, u_char *buf)
{ {
struct mtdids *id = current_part->dev->id; struct mtdids *id = current_part->dev->id;
struct mtd_info *mtd;
u32 bytes_read = 0; u32 bytes_read = 0;
size_t retlen; size_t retlen;
int cpy_bytes; int cpy_bytes;
mtd = get_nand_dev_by_index(id->num);
if (!mtd)
return -1;
while (bytes_read < size) { while (bytes_read < size) {
if ((off + bytes_read < nand_cache_off) || if ((off + bytes_read < nand_cache_off) ||
(off + bytes_read >= nand_cache_off+NAND_CACHE_SIZE)) { (off + bytes_read >= nand_cache_off+NAND_CACHE_SIZE)) {
@ -195,8 +200,8 @@ static int read_nand_cached(u32 off, u32 size, u_char *buf)
} }
retlen = NAND_CACHE_SIZE; retlen = NAND_CACHE_SIZE;
if (nand_read(nand_info[id->num], nand_cache_off, if (nand_read(mtd, nand_cache_off,
&retlen, nand_cache) != 0 || &retlen, nand_cache) != 0 ||
retlen != NAND_CACHE_SIZE) { retlen != NAND_CACHE_SIZE) {
printf("read_nand_cached: error reading nand off %#x size %d bytes\n", printf("read_nand_cached: error reading nand off %#x size %d bytes\n",
nand_cache_off, NAND_CACHE_SIZE); nand_cache_off, NAND_CACHE_SIZE);

6
fs/jffs2/jffs2_nand_1pass.c
View File

@ -796,7 +796,11 @@ jffs2_1pass_build_lists(struct part_info * part)
u32 counterN = 0; u32 counterN = 0;
struct mtdids *id = part->dev->id; struct mtdids *id = part->dev->id;
mtd = nand_info[id->num]; mtd = get_nand_dev_by_index(id->num);
if (!mtd) {
error("\nno NAND devices available\n");
return 0;
}
/* if we are building a list we need to refresh the cache. */ /* if we are building a list we need to refresh the cache. */
jffs_init_1pass_list(part); jffs_init_1pass_list(part);

8
fs/yaffs2/yaffs_uboot_glue.c
View File

@ -166,11 +166,15 @@ void cmd_yaffs_devconfig(char *_mp, int flash_dev,
char *mp = NULL; char *mp = NULL;
struct nand_chip *chip; struct nand_chip *chip;
mtd = get_nand_dev_by_index(flash_dev);
if (!mtd) {
error("\nno NAND devices available\n");
return;
}
dev = calloc(1, sizeof(*dev)); dev = calloc(1, sizeof(*dev));
mp = strdup(_mp); mp = strdup(_mp);
mtd = nand_info[flash_dev];
if (!dev || !mp) { if (!dev || !mp) {
/* Alloc error */ /* Alloc error */
printf("Failed to allocate memory\n"); printf("Failed to allocate memory\n");