| Message ID | 1447722248-135635-1-git-send-email-computersforpeace@gmail.com |
|---|---|
| State | Accepted |
| Commit | 064f462632c2294f9b7fb51a7697392fedeea12e |
| Headers | show |
On 11/16/2015 5:04 PM, Brian Norris wrote: > 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 <computersforpeace@gmail.com> > --- > drivers/mtd/nand/brcmnand/brcmnand.c | 11 ----------- > 1 file changed, 11 deletions(-) > > diff --git a/drivers/mtd/nand/brcmnand/brcmnand.c b/drivers/mtd/nand/brcmnand/brcmnand.c > index 2a437c7ed175..569d57b5a180 100644 > --- a/drivers/mtd/nand/brcmnand/brcmnand.c > +++ b/drivers/mtd/nand/brcmnand/brcmnand.c > @@ -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; > Sanity tested on Cygnus WA board. Finished booting to command prompt with UBIFS based rootfs. Thanks! Tested-by: Ray Jui <rjui@broadcom.com> Ray
On Mon, Nov 16, 2015 at 05:04:08PM -0800, Brian Norris wrote: > 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 <computersforpeace@gmail.com> Pushed to l2-mtd.git
diff --git a/drivers/mtd/nand/brcmnand/brcmnand.c b/drivers/mtd/nand/brcmnand/brcmnand.c index 2a437c7ed175..569d57b5a180 100644 --- a/drivers/mtd/nand/brcmnand/brcmnand.c +++ b/drivers/mtd/nand/brcmnand/brcmnand.c @@ -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;
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 <computersforpeace@gmail.com> --- drivers/mtd/nand/brcmnand/brcmnand.c | 11 ----------- 1 file changed, 11 deletions(-)