Skip to contentSkip to conversation

scsi: scsi_devinfo: remove redundant 'found'

PATCH Applied mrigendrachaubey 3 participants 3 messages Jun 22, 2025 – Jun 25, 2025 SCSI

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 scsi: scsi_devinfo: remove redundant 'found'

Remove the unnecessary 'found' flag in scsi_devinfo_lookup_by_key(). The loop can return the matching entry directly when found, and fall through to return ERR_PTR(-EINVAL) otherwise.

---
 drivers/scsi/scsi_devinfo.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)
drivers/scsi/scsi_devinfo.c +3 -8
index a348df895dca..e364829b6079 100644
@@ -269,17 +269,12 @@ static struct {
 static struct scsi_dev_info_list_table *scsi_devinfo_lookup_by_key(int key)
 {
 	struct scsi_dev_info_list_table *devinfo_table;
-	int found = 0;
 
 	list_for_each_entry(devinfo_table, &scsi_dev_info_list, node)
-		if (devinfo_table->key == key) {
-			found = 1;
-			break;
-		}
-	if (!found)
-		return ERR_PTR(-EINVAL);
+		if (devinfo_table->key == key)
+			return devinfo_table;
 
-	return devinfo_table;
+	return ERR_PTR(-EINVAL);
 }
 
 /*
Signature · 1 line
2.34.1
Reviewed-by on v2 1/1
#1 lore raw
Quoted 22 lines · mrigendrachaubey

Remove the unnecessary 'found' flag in scsi_devinfo_lookup_by_key(). The loop can return the matching entry directly when found, and fall through to return ERR_PTR(-EINVAL) otherwise.

---
  drivers/scsi/scsi_devinfo.c | 11 +++--------
  1 file changed, 3 insertions(+), 8 deletions(-)
drivers/scsi/scsi_devinfo.c +0 -3
index a348df895dca..e364829b6079 100644
@@ -269,17 +269,12 @@ static struct {
  static struct scsi_dev_info_list_table *scsi_devinfo_lookup_by_key(int key)
  {
  	struct scsi_dev_info_list_table *devinfo_table;
-	int found = 0;
 
  	list_for_each_entry(devinfo_table, &scsi_dev_info_list, node)
-		if (devinfo_table->key == key) {
-			found = 1;

drivers/scsi/scsi_devinfo.c static struct { · line 278

Quoted 10 lines
drivers/scsi/scsi_devinfo.c +3 -5
-			break;
-		}
-	if (!found)
-		return ERR_PTR(-EINVAL);
+		if (devinfo_table->key == key)
+			return devinfo_table;
 
-	return devinfo_table;
+	return ERR_PTR(-EINVAL);
  }
#2 lore raw
In reply to mrigendrachaubey
Quoted 4 lines

Remove the unnecessary 'found' flag in scsi_devinfo_lookup_by_key(). The loop can return the matching entry directly when found, and fall through to return ERR_PTR(-EINVAL) otherwise.

Applied to 6.17/scsi-staging, thanks!

Signature · 1 line
Martin K. Petersen