public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] Update core.c
@ 2024-09-30 22:06 Okan Tumuklu
  2024-09-30 22:12 ` Shuah Khan
  2024-10-02 14:11 ` Bagas Sanjaya
  0 siblings, 2 replies; 8+ messages in thread
From: Okan Tumuklu @ 2024-09-30 22:06 UTC (permalink / raw)
  To: shuah; +Cc: linux-kernel, Okan Tümüklü

From: Okan Tümüklü <117488504+Okan-tumuklu@users.noreply.github.com>

1:The control flow was simplified by using else if statements instead of goto structure.

2:Error conditions are handled more clearly.

3:The device_unlock call at the end of the function is guaranteed in all cases.
---
 net/nfc/core.c | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/net/nfc/core.c b/net/nfc/core.c
index e58dc6405054..4e8f01145c37 100644
--- a/net/nfc/core.c
+++ b/net/nfc/core.c
@@ -40,27 +40,19 @@ int nfc_fw_download(struct nfc_dev *dev, const char *firmware_name)
 
 	if (dev->shutting_down) {
 		rc = -ENODEV;
-		goto error;
-	}
-
-	if (dev->dev_up) {
+	}else if (dev->dev_up) {
 		rc = -EBUSY;
-		goto error;
-	}
-
-	if (!dev->ops->fw_download) {
+	}else if (!dev->ops->fw_download) {
 		rc = -EOPNOTSUPP;
-		goto error;
-	}
-
-	dev->fw_download_in_progress = true;
-	rc = dev->ops->fw_download(dev, firmware_name);
-	if (rc)
-		dev->fw_download_in_progress = false;
+	}else{
+		dev->fw_download_in_progress = true;
+		rc = dev->ops->fw_download(dev, firmware_name);
+		if (rc)
+			dev->fw_download_in_progress = false;
+		}
 
-error:
-	device_unlock(&dev->dev);
-	return rc;
+		device_unlock(&dev->dev);
+		return rc;
 }
 
 /**
-- 
2.39.5


^ permalink raw reply related	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2024-10-02 23:41 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-09-30 22:06 [PATCH] Update core.c Okan Tumuklu
2024-09-30 22:12 ` Shuah Khan
2024-09-30 22:20   ` Conor Dooley
2024-10-02 13:27     ` Jakub Kicinski
2024-10-02 15:26       ` Shuah Khan
2024-10-02 22:21       ` Al Viro
2024-10-02 23:41         ` Jakub Kicinski
2024-10-02 14:11 ` Bagas Sanjaya

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox