[PATCH] mtd: m25p80: assign default read command

[PATCH] mtd: m25p80: assign default read command

[Brian Norris]

In the following commit (in -next):

    commit 8552b439aba7f32063755d23f79ca27b4d0a3115
    drivers: mtd: m25p80: convert "bool" read check into an enum

We converted the boolean 'fast_read' property to become an enum
'flash_read', but at the same time, we changed the conditional path so
that it doesn't choose a default value in some cases (technically, we
choose the correct default simply by virtue of devm_kzalloc(), which
zeroes this out to be a NORMAL read operation, but still...).

Fix this by setting a default for the 'else' clause.

Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Cc: Sourav Poddar <sourav.poddar@ti.com>
---
 drivers/mtd/devices/m25p80.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index 19632e330d36..d0f6475504f5 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -1204,6 +1204,8 @@ static int m25p_probe(struct spi_device *spi)
 		/* If we were instantiated by DT, use it */
 		if (of_property_read_bool(np, "m25p,fast-read"))
 			flash->flash_read = M25P80_FAST;
+		else
+			flash->flash_read = M25P80_NORMAL;
 	} else {
 		/* If we weren't instantiated by DT, default to fast-read */
 		flash->flash_read = M25P80_FAST;
-- 
1.8.3.2

Re: [PATCH] mtd: m25p80: assign default read command

[Marek Vasut]

On Thursday, January 16, 2014 at 10:09:07 PM, Brian Norris wrote:
> In the following commit (in -next):
> 
>     commit 8552b439aba7f32063755d23f79ca27b4d0a3115
>     drivers: mtd: m25p80: convert "bool" read check into an enum
> 
> We converted the boolean 'fast_read' property to become an enum
> 'flash_read', but at the same time, we changed the conditional path so
> that it doesn't choose a default value in some cases (technically, we
> choose the correct default simply by virtue of devm_kzalloc(), which
> zeroes this out to be a NORMAL read operation, but still...).

Yep, that's true. It did default to the correct _NORMAL.

> Fix this by setting a default for the 'else' clause.
> 
> Signed-off-by: Brian Norris <computersforpeace@gmail.com>
> Cc: Sourav Poddar <sourav.poddar@ti.com>

Let's be explicit indeed.

Acked-by: Marek Vasut <marex@denx.de>

Best regards,
Marek Vasut

Re: [PATCH] mtd: m25p80: assign default read command

[Brian Norris]

On Sat, Jan 18, 2014 at 07:54:40PM +0100, Marek Vasut wrote:
> On Thursday, January 16, 2014 at 10:09:07 PM, Brian Norris wrote:
> > In the following commit (in -next):
> > 
> >     commit 8552b439aba7f32063755d23f79ca27b4d0a3115
> >     drivers: mtd: m25p80: convert "bool" read check into an enum
> > 
> > We converted the boolean 'fast_read' property to become an enum
> > 'flash_read', but at the same time, we changed the conditional path so
> > that it doesn't choose a default value in some cases (technically, we
> > choose the correct default simply by virtue of devm_kzalloc(), which
> > zeroes this out to be a NORMAL read operation, but still...).
> 
> Yep, that's true. It did default to the correct _NORMAL.
> 
> > Fix this by setting a default for the 'else' clause.
> > 
> > Signed-off-by: Brian Norris <computersforpeace@gmail.com>
> > Cc: Sourav Poddar <sourav.poddar@ti.com>
> 
> Let's be explicit indeed.
> 
> Acked-by: Marek Vasut <marex@denx.de>

Thanks. Pushed to l2-mtd.git.

Brian