Skip to contentSkip to conversation

mtd: spi-nor: Simplify loop in spi_nor_read_id()

PATCH In review Jonathan Neuschäfer 2 participants 5 messages Feb 18, 2020 – Feb 22, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mtd: spi-nor: Simplify loop in spi_nor_read_id()

- 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

---
 drivers/mtd/spi-nor/spi-nor.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/mtd/spi-nor/spi-nor.c +4 -4
index 4fc632ec18fe..c491572d5267 100644
@@ -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

#1 lore raw

Hi, Jonathan,

Quoted 19 lines · EET Jonathan Neuschäfer

EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe

- 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

---
 drivers/mtd/spi-nor/spi-nor.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/mtd/spi-nor/spi-nor.c +0 -0
index 4fc632ec18fe..c491572d5267 100644

drivers/mtd/spi-nor/spi-nor.c static const struct flash_info spi_nor_ids[] = { · line 2714

Quoted 5 lines
drivers/mtd/spi-nor/spi-nor.c +1 -1
@@ -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;

while cleaning this function, would you rename tmp with ret?

drivers/mtd/spi-nor/spi-nor.c static const struct flash_info spi_nor_ids[] = { · line 2715

Quoted 1 line
drivers/mtd/spi-nor/spi-nor.c +0 -0
        u8                      *id = nor->bouncebuf;

and please drop this tab between u8 and *id

drivers/mtd/spi-nor/spi-nor.c static const struct flash_info spi_nor_ids[] = { · line 2716

Quoted 1 line
drivers/mtd/spi-nor/spi-nor.c +0 -0
        const struct flash_info *info;

Also, IMO, the definition of variables should be done with the focus of avoiding stack padding. With this in mind, I would first define the pointers and then the ints and smaller types. But there are others than prefer defining the variables in a tree/reverse-tree way, depending of the length of the line. There's no agreement on this, either way if fine, do as you prefer.

drivers/mtd/spi-nor/spi-nor.c static const struct flash_info · line 2739

Quoted 13 lines
drivers/mtd/spi-nor/spi-nor.c +3 -3
@@ -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;

Looks good,

Cheers,
ta

#2 lore raw

On Wed, Feb 19, 2020 at 08:06:08AM +0000, [email protected] wrote:
[...]

Quoted 6 lines

drivers/mtd/spi-nor/spi-nor.c static const struct flash_info spi_nor_ids[] = { · line 2714

Quoted 4 lines

static const struct flash_info *spi_nor_read_id(struct spi_nor *nor) {

drivers/mtd/spi-nor/spi-nor.c +1 -1
-       int                     tmp;
+       int                     tmp, i;

while cleaning this function, would you rename tmp with ret?

Good idea, I'll do that in v2.

Quoted 3 lines
Quoted 1 line
        u8                      *id = nor->bouncebuf;

and please drop this tab between u8 and *id

The same with the other variables in this functions? They have tabs between the type and the pointer star / name as well.

Quoted 8 lines
Quoted 2 lines
        const struct flash_info *info;

Also, IMO, the definition of variables should be done with the focus of avoiding stack padding. With this in mind, I would first define the pointers and then the ints and smaller types. But there are others than prefer defining the variables in a tree/reverse-tree way, depending of the length of the line. There's no agreement on this, either way if fine, do as you prefer.

I have no preference here. I think I'll keep it as is for now.

Thanks for the review,
Jonathan Neuschäfer

______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/

#3 lore raw
Quoted 11 lines · EET Jonathan Neuschäfer

On Wed, Feb 19, 2020 at 08:06:08AM +0000, [email protected] wrote:
[...]

Quoted 7 lines

drivers/mtd/spi-nor/spi-nor.c static const struct flash_info spi_nor_ids[] = { · line 2714

Quoted 5 lines

static const struct flash_info *spi_nor_read_id(struct spi_nor *nor) {

drivers/mtd/spi-nor/spi-nor.c +1 -1
-       int                     tmp;
+       int                     tmp, i;

while cleaning this function, would you rename tmp with ret?

Quoted 8 lines

Good idea, I'll do that in v2.

Quoted 3 lines
Quoted 1 line
        u8                      *id = nor->bouncebuf;

and please drop this tab between u8 and *id

The same with the other variables in this functions? They have tabs between the type and the pointer star / name as well.

yes, please.

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
        const struct flash_info *info;

how about getting rid of this local variable? Use in the function something like:

                if (spi_nor_ids[i].id_len &&
                    !memcmp(spi_nor_ids[i].id, id, spi_nor_ids[i].id_len)
                    return &spi_nor_ids[i];
Quoted 9 lines
Quoted 7 lines

Also, IMO, the definition of variables should be done with the focus of avoiding stack padding. With this in mind, I would first define the pointers and then the ints and smaller types. But there are others than prefer defining the variables in a tree/reverse-tree way, depending of the length of the line. There's no agreement on this, either way if fine, do as you prefer.

I have no preference here. I think I'll keep it as is for now.

Ok. Cheers,
ta

#4 lore raw
Quoted 8 lines · On Fri, Feb 21, 2020 at 04:50:37PM +0000, [email protected] wrote:
Quoted 1 line
Quoted 1 line
Quoted 1 line
        const struct flash_info *info;

how about getting rid of this local variable? Use in the function something like:

                if (spi_nor_ids[i].id_len &&
                    !memcmp(spi_nor_ids[i].id, id, spi_nor_ids[i].id_len)
                    return &spi_nor_ids[i];

Looks alright. I'll do it.

Jonathan