Skip to contentSkip to conversation

firmware: arm_scmi: Clean up a return statement

PATCH Applied Dan Carpenter 3 participants 3 messages Jan 23, 2023 – Mar 9, 2023

Subsystems (2)
Kernel janitors System control & power/management interface (SCPI/SCMI) Message Protocol drivers
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 firmware: arm_scmi: Clean up a return statement

The comments say "enabled" where "disabled" is intended. Also it's cleaner to return zero explicitly instead of ret.

Signed-off-by Dan Carpenter <[email protected]>
---
 drivers/firmware/arm_scmi/driver.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/firmware/arm_scmi/driver.c +2 -2
index d21c7eafd641..703f16ef3953 100644
@@ -2739,8 +2739,8 @@ static int scmi_probe(struct platform_device *pdev)
 				if (ret)
 					goto clear_dev_req_notifier;
 
-				/* Bail out anyway when coex enabled */
-				return ret;
+				/* Bail out anyway when coex disabled. */
+				return 0;
 			}
 
 			/* Coex enabled, carry on in any case. */
Signature · 1 line
2.35.1
reviewer
#1 lore raw
Quoted 14 lines · Dan Carpenter

The comments say "enabled" where "disabled" is intended. Also it's cleaner to return zero explicitly instead of ret.

Signed-off-by Dan Carpenter <[email protected]>
---
 drivers/firmware/arm_scmi/driver.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/firmware/arm_scmi/driver.c +0 -0
index d21c7eafd641..703f16ef3953 100644

drivers/firmware/arm_scmi/driver.c static int scmi_probe(struct platform_device *pdev) · line 2746

Quoted 10 lines
drivers/firmware/arm_scmi/driver.c +2 -2
@@ -2739,8 +2739,8 @@ static int scmi_probe(struct platform_device *pdev)
 				if (ret)
 					goto clear_dev_req_notifier;
 
-				/* Bail out anyway when coex enabled */
-				return ret;
+				/* Bail out anyway when coex disabled. */
+				return 0;
 			}
 
 			/* Coex enabled, carry on in any case. */

Indeed.

Thanks,
Cristian