| Message ID | ad5a4648bd2486d5c8e671312a0a717fa2a6b2b8.1475668319.git.cyrille.pitchen@atmel.com |
|---|---|
| State | Superseded |
| Headers | show |
On Wed, Oct 5, 2016 at 5:30 PM, Cyrille Pitchen <cyrille.pitchen@atmel.com> wrote: > The patch checks whether the Quad Enable bit is already set in the Status > Register. If so, the function exits immediately with a successful return > code. Otherwise, a message is now printed telling we're setting the > non-volatile bit. > > Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com> Reviewed-by: Jagan Teki <jagan@openedev.com> > --- > drivers/mtd/spi-nor/spi-nor.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c > index d0fc165d7d66..5c87b2d99507 100644 > --- a/drivers/mtd/spi-nor/spi-nor.c > +++ b/drivers/mtd/spi-nor/spi-nor.c > @@ -1211,6 +1211,11 @@ static int macronix_quad_enable(struct spi_nor *nor) > val = read_sr(nor); > if (val < 0) > return val; > + if (val & SR_QUAD_EN_MX) > + return 0; > + > + /* Update the Quad Enable bit. */ > + dev_info(nor->dev, "setting Macronix Quad Enable (non-volatile) bit\n"); > write_enable(nor); > > write_sr(nor, val | SR_QUAD_EN_MX); Safe to save ret and check the same as well. thanks!
diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c index d0fc165d7d66..5c87b2d99507 100644 --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c @@ -1211,6 +1211,11 @@ static int macronix_quad_enable(struct spi_nor *nor) val = read_sr(nor); if (val < 0) return val; + if (val & SR_QUAD_EN_MX) + return 0; + + /* Update the Quad Enable bit. */ + dev_info(nor->dev, "setting Macronix Quad Enable (non-volatile) bit\n"); write_enable(nor); write_sr(nor, val | SR_QUAD_EN_MX);
The patch checks whether the Quad Enable bit is already set in the Status Register. If so, the function exits immediately with a successful return code. Otherwise, a message is now printed telling we're setting the non-volatile bit. Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com> --- drivers/mtd/spi-nor/spi-nor.c | 5 +++++ 1 file changed, 5 insertions(+)