On Fri, Nov 29, 2013 at 12:19:19PM +0000, Lee Jones wrote: > When an erase is requested by userspace the MFD framework calls back
s/MFD/MTD/ ;) > into the driver to conduct the actual command issue. Here we provide the > routines which do exactly that. We can choose to either do an entire chip > erase or by sector. > > Signed-off-by: Lee Jones <[email protected]> > --- > drivers/mtd/devices/st_spi_fsm.c | 118 > ++++++++++++++++++++++++++++++++++++++- > 1 file changed, 117 insertions(+), 1 deletion(-) > > diff --git a/drivers/mtd/devices/st_spi_fsm.c > b/drivers/mtd/devices/st_spi_fsm.c > index 9b35e15..ecb001d 100644 > --- a/drivers/mtd/devices/st_spi_fsm.c > +++ b/drivers/mtd/devices/st_spi_fsm.c > @@ -861,6 +923,60 @@ out1: > return ret; > } > > +/* > + * Erase an address range on the flash chip. The address range may extend > + * one or more erase sectors. Return an error is there is a problem erasing. > + */ > +static int stfsm_mtd_erase(struct mtd_info *mtd, struct erase_info *instr) > +{ > + struct stfsm *fsm = dev_get_drvdata(mtd->dev.parent); > + u32 addr, len; > + int ret; > + > + dev_dbg(fsm->dev, "%s at 0x%llx, len %lld\n", __func__, > + (long long)instr->addr, (long long)instr->len); > + > + if (instr->addr + instr->len > mtd->size) > + return -EINVAL; Duplicated from mtd_read(). Kill this. > + > + if (instr->len & (mtd->erasesize - 1)) > + return -EINVAL; ... > @@ -1131,7 +1247,7 @@ static int stfsm_probe(struct platform_device *pdev) > > fsm->mtd._read = stfsm_mtd_read; > fsm->mtd._write = stfsm_mtd_write; > - > + fsm->mtd._erase = stfsm_mtd_erase; Can you leave the blank line between assigning fsm->mtd.xxx callbacks and the dev_err()? > dev_err(&pdev->dev, > "Found serial flash device: %s\n" > " size = %llx (%lldMiB) erasesize = 0x%08x (%uKiB)\n", (BTW, why is this dev_err()?? It's just information, so you want dev_info().) Brian -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
