Skip to contentSkip to conversation

mtd: brcmnand: drop unused subpage_read() support

PATCH Applied Brian Norris 2 participants 3 messages Nov 17, 2015 – Nov 18, 2015

Subsystems (2)
Memory technology devices (MTD) NAND flash
lore
Share & tools
lore

Brian Norris

author
#0 lore raw

PATCH 1/1 mtd: brcmnand: drop unused subpage_read() support

AFAIR this driver was never tested with subpage read support, and this code is currently unused because we don't set the NAND_SUBPAGE_READ flag. It can be resurrected if someone tests it properly.

Signed-off-by Brian Norris <[email protected]>
---
 drivers/mtd/nand/brcmnand/brcmnand.c | 11 -----------
 1 file changed, 11 deletions(-)
drivers/mtd/nand/brcmnand/brcmnand.c +0 -11
index 2a437c7ed175..569d57b5a180 100644
@@ -1546,16 +1546,6 @@ static int brcmnand_read_oob_raw(struct mtd_info *mtd, struct nand_chip *chip,
 	return 0;
 }
 
-static int brcmnand_read_subpage(struct mtd_info *mtd, struct nand_chip *chip,
-				 uint32_t data_offs, uint32_t readlen,
-				 uint8_t *bufpoi, int page)
-{
-	struct brcmnand_host *host = chip->priv;
-
-	return brcmnand_read(mtd, chip, host->last_addr + data_offs,
-			readlen >> FC_SHIFT, (u32 *)bufpoi, NULL);
-}
-
 static int brcmnand_write(struct mtd_info *mtd, struct nand_chip *chip,
 			  u64 addr, const u32 *buf, u8 *oob)
 {

@@ -1944,7 +1934,6 @@ static int brcmnand_init_cs(struct brcmnand_host *host)
 
 	chip->ecc.mode = NAND_ECC_HW;
 	chip->ecc.read_page = brcmnand_read_page;
-	chip->ecc.read_subpage = brcmnand_read_subpage;
 	chip->ecc.write_page = brcmnand_write_page;
 	chip->ecc.read_page_raw = brcmnand_read_page_raw;
 	chip->ecc.write_page_raw = brcmnand_write_page_raw;
Signature · 1 line
2.6.0.rc2.230.g3dd15c0
Tested-by on v1 1/1
#1 lore raw
Quoted 32 lines · Brian Norris

AFAIR this driver was never tested with subpage read support, and this code is currently unused because we don't set the NAND_SUBPAGE_READ flag. It can be resurrected if someone tests it properly.

Signed-off-by Brian Norris <[email protected]>
---
  drivers/mtd/nand/brcmnand/brcmnand.c | 11 -----------
  1 file changed, 11 deletions(-)
drivers/mtd/nand/brcmnand/brcmnand.c +0 -10
index 2a437c7ed175..569d57b5a180 100644
@@ -1546,16 +1546,6 @@ static int brcmnand_read_oob_raw(struct mtd_info *mtd, struct nand_chip *chip,
  	return 0;
  }
 
-static int brcmnand_read_subpage(struct mtd_info *mtd, struct nand_chip *chip,
-				 uint32_t data_offs, uint32_t readlen,
-				 uint8_t *bufpoi, int page)
-{
-	struct brcmnand_host *host = chip->priv;
-
-	return brcmnand_read(mtd, chip, host->last_addr + data_offs,
-			readlen >> FC_SHIFT, (u32 *)bufpoi, NULL);
-}
-
  static int brcmnand_write(struct mtd_info *mtd, struct nand_chip *chip,
  			  u64 addr, const u32 *buf, u8 *oob)
  {

drivers/mtd/nand/brcmnand/brcmnand.c static int brcmnand_init_cs(struct brcmnand_host *host) · line 1939

Quoted 7 lines
drivers/mtd/nand/brcmnand/brcmnand.c +0 -1
@@ -1944,7 +1934,6 @@ static int brcmnand_init_cs(struct brcmnand_host *host)
 
  	chip->ecc.mode = NAND_ECC_HW;
  	chip->ecc.read_page = brcmnand_read_page;
-	chip->ecc.read_subpage = brcmnand_read_subpage;
  	chip->ecc.write_page = brcmnand_write_page;
  	chip->ecc.read_page_raw = brcmnand_read_page_raw;
  	chip->ecc.write_page_raw = brcmnand_write_page_raw;

Sanity tested on Cygnus WA board. Finished booting to command prompt with UBIFS based rootfs.

Thanks!

Tested-by Ray Jui <[email protected]>

Ray