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

mtd: rawnand: gpmi: remove unnecessary variables

Browse Source 
Use this->auxiliary_virt and this->auxiliary_phys directly rather
than creating extra local variables for them.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
This commit is contained in:
Sascha Hauer 2018-04-26 17:41:27 +02:00 committed by Boris Brezillon
parent e637f5fe8e
commit f6b74db84c
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
View File

@ -959,8 +959,6 @@ static int gpmi_ecc_read_page_data(struct nand_chip *chip,
struct mtd_info *mtd = nand_to_mtd(chip); struct mtd_info *mtd = nand_to_mtd(chip);
void *payload_virt; void *payload_virt;
dma_addr_t payload_phys; dma_addr_t payload_phys;
void *auxiliary_virt;
dma_addr_t auxiliary_phys;
unsigned int i; unsigned int i;
unsigned char *status; unsigned char *status;
unsigned int max_bitflips = 0; unsigned int max_bitflips = 0;
@ -984,11 +982,8 @@ static int gpmi_ecc_read_page_data(struct nand_chip *chip,
} }
} }
auxiliary_virt = this->auxiliary_virt;
auxiliary_phys = this->auxiliary_phys;
/* go! */ /* go! */
ret = gpmi_read_page(this, payload_phys, auxiliary_phys); ret = gpmi_read_page(this, payload_phys, this->auxiliary_phys);
if (direct) if (direct)
dma_unmap_single(this->dev, payload_phys, nfc_geo->payload_size, dma_unmap_single(this->dev, payload_phys, nfc_geo->payload_size,
@ -1000,7 +995,7 @@ static int gpmi_ecc_read_page_data(struct nand_chip *chip,
} }
/* Loop over status bytes, accumulating ECC status. */ /* Loop over status bytes, accumulating ECC status. */
status = auxiliary_virt + nfc_geo->auxiliary_status_offset; status = this->auxiliary_virt + nfc_geo->auxiliary_status_offset;
if (!direct) if (!direct)
memcpy(buf, this->payload_virt, nfc_geo->payload_size); memcpy(buf, this->payload_virt, nfc_geo->payload_size);
@ -1058,7 +1053,7 @@ static int gpmi_ecc_read_page_data(struct nand_chip *chip,
buf + i * nfc_geo->ecc_chunk_size, buf + i * nfc_geo->ecc_chunk_size,
nfc_geo->ecc_chunk_size, nfc_geo->ecc_chunk_size,
eccbuf, eccbytes, eccbuf, eccbytes,
auxiliary_virt, this->auxiliary_virt,
nfc_geo->metadata_size, nfc_geo->metadata_size,
nfc_geo->ecc_strength); nfc_geo->ecc_strength);
} else { } else {
@ -1086,7 +1081,7 @@ static int gpmi_ecc_read_page_data(struct nand_chip *chip,
} }
/* handle the block mark swapping */ /* handle the block mark swapping */
block_mark_swapping(this, buf, auxiliary_virt); block_mark_swapping(this, buf, this->auxiliary_virt);
if (oob_required) { if (oob_required) {
/* /*
@ -1100,7 +1095,7 @@ static int gpmi_ecc_read_page_data(struct nand_chip *chip,
* the block mark. * the block mark.
*/ */
memset(chip->oob_poi, ~0, mtd->oobsize); memset(chip->oob_poi, ~0, mtd->oobsize);
chip->oob_poi[0] = ((uint8_t *) auxiliary_virt)[0]; chip->oob_poi[0] = ((uint8_t *)this->auxiliary_virt)[0];
} }
return max_bitflips; return max_bitflips;