lkml.org 
[lkml]   [2020]   [Feb]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] mtd: spi-nor: Simplify loop in spi_nor_read_id()
Date
- Don't use `tmp` for two purposes (return value, loop counter)
- Name the loop counter `i`, as is convention
- Return the pointer variable that the if conditions leading up to the
return statement already operate on, rather than a different
expression that evaluates to the same pointer

Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net>
---
drivers/mtd/spi-nor/spi-nor.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c
index 4fc632ec18fe..c491572d5267 100644
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
@@ -2711,7 +2711,7 @@ static const struct flash_info spi_nor_ids[] = {

static const struct flash_info *spi_nor_read_id(struct spi_nor *nor)
{
- int tmp;
+ int tmp, i;
u8 *id = nor->bouncebuf;
const struct flash_info *info;

@@ -2732,11 +2732,11 @@ static const struct flash_info *spi_nor_read_id(struct spi_nor *nor)
return ERR_PTR(tmp);
}

- for (tmp = 0; tmp < ARRAY_SIZE(spi_nor_ids) - 1; tmp++) {
- info = &spi_nor_ids[tmp];
+ for (i = 0; i < ARRAY_SIZE(spi_nor_ids) - 1; i++) {
+ info = &spi_nor_ids[i];
if (info->id_len) {
if (!memcmp(info->id, id, info->id_len))
- return &spi_nor_ids[tmp];
+ return info;
}
}
dev_err(nor->dev, "unrecognized JEDEC id bytes: %*ph\n",
--
2.20.1
\
 
 \ /
  Last update: 2020-02-18 16:12    [W:0.200 / U:0.012 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site