Skip to contentSkip to conversation

fpga: Fix dead store

PATCH Applied [email protected] 2 participants 5 messages Jun 8, 2020 – Jun 19, 2020 FPGA manager framework

lore
Share & tools
lore

[email protected]

author reviewer
#0 lore raw

v2 cover fpga: Fix dead store

From: Tom Rix <[email protected]>

repo: linux-next
tag: next-20200608

A couple of fixes for dead stores found by clang's sa tool scan-build

Main changes from v1:
Split single patch into two patch

Tom Rix (2):
fpga: Fix dead store fpga-mgr.c
fpga: Fix dead store in fpga-bridge.c

 drivers/fpga/fpga-bridge.c | 6 ++----
 drivers/fpga/fpga-mgr.c    | 4 +---
 2 files changed, 3 insertions(+), 7 deletions(-)
Signature · 1 line
2.26.0
author reviewer
#1 lore raw

PATCH v2 1/2 fpga: Fix dead store fpga-mgr.c

From: Tom Rix <[email protected]>

Using clang's scan-build/view this issue was flagged in fpga-mgr.c

drivers/fpga/fpga-mgr.c:585:3: warning: Value stored to 'ret' is never read [deadcode.DeadStores]

                  ret = id;
---
 drivers/fpga/fpga-mgr.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/fpga/fpga-mgr.c +1 -3
index e05104f5e40c..f38bab01432e 100644
@@ -581,10 +581,8 @@ struct fpga_manager *fpga_mgr_create(struct device *dev, const char *name,
 		return NULL;
 
 	id = ida_simple_get(&fpga_mgr_ida, 0, 0, GFP_KERNEL);
-	if (id < 0) {
-		ret = id;
+	if (id < 0)
 		goto error_kfree;
-	}
 
 	mutex_init(&mgr->ref_mutex);
 
Signature · 1 line
2.18.2
maintainer Applied
#2 lore raw

Re: [PATCH v2 1/2] fpga: Fix dead store fpga-mgr.c

Quoted 31 lines · On Mon, Jun 08, 2020 at 05:54:45AM -0700, [email protected] wrote:

From: Tom Rix <[email protected]>

Using clang's scan-build/view this issue was flagged in fpga-mgr.c

drivers/fpga/fpga-mgr.c:585:3: warning: Value stored to 'ret' is never read [deadcode.DeadStores]

                  ret = id;
---
 drivers/fpga/fpga-mgr.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/fpga/fpga-mgr.c +1 -3
index e05104f5e40c..f38bab01432e 100644
@@ -581,10 +581,8 @@ struct fpga_manager *fpga_mgr_create(struct device *dev, const char *name,
 		return NULL;
 
 	id = ida_simple_get(&fpga_mgr_ida, 0, 0, GFP_KERNEL);
-	if (id < 0) {
-		ret = id;
+	if (id < 0)
 		goto error_kfree;
-	}
 
 	mutex_init(&mgr->ref_mutex);
 
Signature · 1 line
2.18.2

Applied to for-next,

Thanks!

author reviewer
#3 lore raw

PATCH v2 2/2 fpga: Fix dead store in fpga-bridge.c

In reply to [email protected]

From: Tom Rix <[email protected]>

Using clang's scan-build/view this issue was flagged a dead store issue in fpga-bridge.c

warning: Value stored to 'ret' is never read [deadcode.DeadStores]

                  ret = id;
---
 drivers/fpga/fpga-bridge.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/fpga/fpga-bridge.c +2 -4
index 4bab9028940a..2deccacc3aa7 100644
@@ -328,7 +328,7 @@ struct fpga_bridge *fpga_bridge_create(struct device *dev, const char *name,
 				       void *priv)
 {
 	struct fpga_bridge *bridge;
-	int id, ret = 0;
+	int id, ret;
 
 	if (!name || !strlen(name)) {
 		dev_err(dev, "Attempt to register with no name!\n");
@@ -340,10 +340,8 @@ struct fpga_bridge *fpga_bridge_create(struct device *dev, const char *name,
 		return NULL;
 
 	id = ida_simple_get(&fpga_bridge_ida, 0, 0, GFP_KERNEL);
-	if (id < 0) {
-		ret = id;
+	if (id < 0)
 		goto error_kfree;
-	}
 
 	mutex_init(&bridge->mutex);
 	INIT_LIST_HEAD(&bridge->node);
Signature · 1 line
2.18.2
maintainer Applied
#4 lore raw

Re: [PATCH v2 2/2] fpga: Fix dead store in fpga-bridge.c

Quoted 41 lines · On Mon, Jun 08, 2020 at 05:54:46AM -0700, [email protected] wrote:

From: Tom Rix <[email protected]>

Using clang's scan-build/view this issue was flagged a dead store issue in fpga-bridge.c

warning: Value stored to 'ret' is never read [deadcode.DeadStores]

                  ret = id;
---
 drivers/fpga/fpga-bridge.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/fpga/fpga-bridge.c +2 -4
index 4bab9028940a..2deccacc3aa7 100644
@@ -328,7 +328,7 @@ struct fpga_bridge *fpga_bridge_create(struct device *dev, const char *name,
 				       void *priv)
 {
 	struct fpga_bridge *bridge;
-	int id, ret = 0;
+	int id, ret;
 
 	if (!name || !strlen(name)) {
 		dev_err(dev, "Attempt to register with no name!\n");
@@ -340,10 +340,8 @@ struct fpga_bridge *fpga_bridge_create(struct device *dev, const char *name,
 		return NULL;
 
 	id = ida_simple_get(&fpga_bridge_ida, 0, 0, GFP_KERNEL);
-	if (id < 0) {
-		ret = id;
+	if (id < 0)
 		goto error_kfree;
-	}
 
 	mutex_init(&bridge->mutex);
 	INIT_LIST_HEAD(&bridge->node);
Signature · 1 line
2.18.2

Applied to for-next,

Thanks!