leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mtd: nand: denali: rename misleading dma_buf to tmp_buf

Browse Source 
The "dma_buf" is not used for a DMA bounce buffer, but for arranging
the transferred data for the syndrome page layout.  In fact, it is
used in the PIO mode as well, so "dma_buf" is a misleading name.
Rename it to "tmp_buf".

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
This commit is contained in:
Masahiro Yamada 2017-11-23 22:32:28 +09:00 committed by Boris Brezillon
parent c9e916a4b4
commit 8a8c8ba1c8
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/mtd/nand/denali.c
View File

@ -710,12 +710,12 @@ static int denali_read_page_raw(struct mtd_info *mtd, struct nand_chip *chip,
int ecc_steps = chip->ecc.steps; int ecc_steps = chip->ecc.steps;
int ecc_size = chip->ecc.size; int ecc_size = chip->ecc.size;
int ecc_bytes = chip->ecc.bytes; int ecc_bytes = chip->ecc.bytes;
void *dma_buf = denali->buf; void *tmp_buf = denali->buf;
int oob_skip = denali->oob_skip_bytes; int oob_skip = denali->oob_skip_bytes;
size_t size = writesize + oobsize; size_t size = writesize + oobsize;
int ret, i, pos, len; int ret, i, pos, len;
ret = denali_data_xfer(denali, dma_buf, size, page, 1, 0); ret = denali_data_xfer(denali, tmp_buf, size, page, 1, 0);
if (ret) if (ret)
return ret; return ret;
@ -730,11 +730,11 @@ static int denali_read_page_raw(struct mtd_info *mtd, struct nand_chip *chip,
else if (pos + len > writesize) else if (pos + len > writesize)
len = writesize - pos; len = writesize - pos;
memcpy(buf, dma_buf + pos, len); memcpy(buf, tmp_buf + pos, len);
buf += len; buf += len;
if (len < ecc_size) { if (len < ecc_size) {
len = ecc_size - len; len = ecc_size - len;
memcpy(buf, dma_buf + writesize + oob_skip, memcpy(buf, tmp_buf + writesize + oob_skip,
len); len);
buf += len; buf += len;
} }
@ -745,7 +745,7 @@ static int denali_read_page_raw(struct mtd_info *mtd, struct nand_chip *chip,
uint8_t *oob = chip->oob_poi; uint8_t *oob = chip->oob_poi;
/* BBM at the beginning of the OOB area */ /* BBM at the beginning of the OOB area */
memcpy(oob, dma_buf + writesize, oob_skip); memcpy(oob, tmp_buf + writesize, oob_skip);
oob += oob_skip; oob += oob_skip;
/* OOB ECC */ /* OOB ECC */
@ -758,11 +758,11 @@ static int denali_read_page_raw(struct mtd_info *mtd, struct nand_chip *chip,
else if (pos + len > writesize) else if (pos + len > writesize)
len = writesize - pos; len = writesize - pos;
memcpy(oob, dma_buf + pos, len); memcpy(oob, tmp_buf + pos, len);
oob += len; oob += len;
if (len < ecc_bytes) { if (len < ecc_bytes) {
len = ecc_bytes - len; len = ecc_bytes - len;
memcpy(oob, dma_buf + writesize + oob_skip, memcpy(oob, tmp_buf + writesize + oob_skip,
len); len);
oob += len; oob += len;
} }
@ -770,7 +770,7 @@ static int denali_read_page_raw(struct mtd_info *mtd, struct nand_chip *chip,
/* OOB free */ /* OOB free */
len = oobsize - (oob - chip->oob_poi); len = oobsize - (oob - chip->oob_poi);
memcpy(oob, dma_buf + size - len, len); memcpy(oob, tmp_buf + size - len, len);
} }
return 0; return 0;
@ -841,7 +841,7 @@ static int denali_write_page_raw(struct mtd_info *mtd, struct nand_chip *chip,
int ecc_steps = chip->ecc.steps; int ecc_steps = chip->ecc.steps;
int ecc_size = chip->ecc.size; int ecc_size = chip->ecc.size;
int ecc_bytes = chip->ecc.bytes; int ecc_bytes = chip->ecc.bytes;
void *dma_buf = denali->buf; void *tmp_buf = denali->buf;
int oob_skip = denali->oob_skip_bytes; int oob_skip = denali->oob_skip_bytes;
size_t size = writesize + oobsize; size_t size = writesize + oobsize;
int i, pos, len; int i, pos, len;
@ -851,7 +851,7 @@ static int denali_write_page_raw(struct mtd_info *mtd, struct nand_chip *chip,
* This simplifies the logic. * This simplifies the logic.
*/ */
if (!buf || !oob_required) if (!buf || !oob_required)
memset(dma_buf, 0xff, size); memset(tmp_buf, 0xff, size);
/* Arrange the buffer for syndrome payload/ecc layout */ /* Arrange the buffer for syndrome payload/ecc layout */
if (buf) { if (buf) {
@ -864,11 +864,11 @@ static int denali_write_page_raw(struct mtd_info *mtd, struct nand_chip *chip,
else if (pos + len > writesize) else if (pos + len > writesize)
len = writesize - pos; len = writesize - pos;
memcpy(dma_buf + pos, buf, len); memcpy(tmp_buf + pos, buf, len);
buf += len; buf += len;
if (len < ecc_size) { if (len < ecc_size) {
len = ecc_size - len; len = ecc_size - len;
memcpy(dma_buf + writesize + oob_skip, buf, memcpy(tmp_buf + writesize + oob_skip, buf,
len); len);
buf += len; buf += len;
} }
@ -879,7 +879,7 @@ static int denali_write_page_raw(struct mtd_info *mtd, struct nand_chip *chip,
const uint8_t *oob = chip->oob_poi; const uint8_t *oob = chip->oob_poi;
/* BBM at the beginning of the OOB area */ /* BBM at the beginning of the OOB area */
memcpy(dma_buf + writesize, oob, oob_skip); memcpy(tmp_buf + writesize, oob, oob_skip);
oob += oob_skip; oob += oob_skip;
/* OOB ECC */ /* OOB ECC */
@ -892,11 +892,11 @@ static int denali_write_page_raw(struct mtd_info *mtd, struct nand_chip *chip,
else if (pos + len > writesize) else if (pos + len > writesize)
len = writesize - pos; len = writesize - pos;
memcpy(dma_buf + pos, oob, len); memcpy(tmp_buf + pos, oob, len);
oob += len; oob += len;
if (len < ecc_bytes) { if (len < ecc_bytes) {
len = ecc_bytes - len; len = ecc_bytes - len;
memcpy(dma_buf + writesize + oob_skip, oob, memcpy(tmp_buf + writesize + oob_skip, oob,
len); len);
oob += len; oob += len;
} }
@ -904,10 +904,10 @@ static int denali_write_page_raw(struct mtd_info *mtd, struct nand_chip *chip,
/* OOB free */ /* OOB free */
len = oobsize - (oob - chip->oob_poi); len = oobsize - (oob - chip->oob_poi);
memcpy(dma_buf + size - len, oob, len); memcpy(tmp_buf + size - len, oob, len);
} }
return denali_data_xfer(denali, dma_buf, size, page, 1, 1); return denali_data_xfer(denali, tmp_buf, size, page, 1, 1);
} }
static int denali_write_page(struct mtd_info *mtd, struct nand_chip *chip, static int denali_write_page(struct mtd_info *mtd, struct nand_chip *chip,