Skip to content

Commit 56fce75

Browse files
Noltarimiquelraynal
authored andcommitted
mtd: rawnand: brcmnand: remove unused parameters
last_cmd and last_byte are now unused brcmnand_host members. last_addr is only written and never read so we can remove it too. Signed-off-by: Álvaro Fernández Rojas <[email protected]> Reviewed-by: Florian Fainelli <[email protected]> Reviewed-by: William Zhang <[email protected]> Signed-off-by: Miquel Raynal <[email protected]>
1 parent 615f8f5 commit 56fce75

File tree

1 file changed

+6
-18
lines changed

1 file changed

+6
-18
lines changed

drivers/mtd/nand/raw/brcmnand/brcmnand.c

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -310,9 +310,6 @@ struct brcmnand_host {
310310
struct platform_device *pdev;
311311
int cs;
312312

313-
unsigned int last_cmd;
314-
unsigned int last_byte;
315-
u64 last_addr;
316313
struct brcmnand_cfg hwcfg;
317314
struct brcmnand_controller *ctrl;
318315
};
@@ -2233,14 +2230,11 @@ static int brcmnand_read_page(struct nand_chip *chip, uint8_t *buf,
22332230
int oob_required, int page)
22342231
{
22352232
struct mtd_info *mtd = nand_to_mtd(chip);
2236-
struct brcmnand_host *host = nand_get_controller_data(chip);
22372233
u8 *oob = oob_required ? (u8 *)chip->oob_poi : NULL;
22382234
u64 addr = (u64)page << chip->page_shift;
22392235

2240-
host->last_addr = addr;
2241-
2242-
return brcmnand_read(mtd, chip, host->last_addr,
2243-
mtd->writesize >> FC_SHIFT, (u32 *)buf, oob);
2236+
return brcmnand_read(mtd, chip, addr, mtd->writesize >> FC_SHIFT,
2237+
(u32 *)buf, oob);
22442238
}
22452239

22462240
static int brcmnand_read_page_raw(struct nand_chip *chip, uint8_t *buf,
@@ -2252,11 +2246,9 @@ static int brcmnand_read_page_raw(struct nand_chip *chip, uint8_t *buf,
22522246
int ret;
22532247
u64 addr = (u64)page << chip->page_shift;
22542248

2255-
host->last_addr = addr;
2256-
22572249
brcmnand_set_ecc_enabled(host, 0);
2258-
ret = brcmnand_read(mtd, chip, host->last_addr,
2259-
mtd->writesize >> FC_SHIFT, (u32 *)buf, oob);
2250+
ret = brcmnand_read(mtd, chip, addr, mtd->writesize >> FC_SHIFT,
2251+
(u32 *)buf, oob);
22602252
brcmnand_set_ecc_enabled(host, 1);
22612253
return ret;
22622254
}
@@ -2363,13 +2355,10 @@ static int brcmnand_write_page(struct nand_chip *chip, const uint8_t *buf,
23632355
int oob_required, int page)
23642356
{
23652357
struct mtd_info *mtd = nand_to_mtd(chip);
2366-
struct brcmnand_host *host = nand_get_controller_data(chip);
23672358
void *oob = oob_required ? chip->oob_poi : NULL;
23682359
u64 addr = (u64)page << chip->page_shift;
23692360

2370-
host->last_addr = addr;
2371-
2372-
return brcmnand_write(mtd, chip, host->last_addr, (const u32 *)buf, oob);
2361+
return brcmnand_write(mtd, chip, addr, (const u32 *)buf, oob);
23732362
}
23742363

23752364
static int brcmnand_write_page_raw(struct nand_chip *chip, const uint8_t *buf,
@@ -2381,9 +2370,8 @@ static int brcmnand_write_page_raw(struct nand_chip *chip, const uint8_t *buf,
23812370
u64 addr = (u64)page << chip->page_shift;
23822371
int ret = 0;
23832372

2384-
host->last_addr = addr;
23852373
brcmnand_set_ecc_enabled(host, 0);
2386-
ret = brcmnand_write(mtd, chip, host->last_addr, (const u32 *)buf, oob);
2374+
ret = brcmnand_write(mtd, chip, addr, (const u32 *)buf, oob);
23872375
brcmnand_set_ecc_enabled(host, 1);
23882376

23892377
return ret;

0 commit comments

Comments
 (0)