From: Johan Hovold <johan@kernel.org>
Date: Fri, 24 Apr 2026 15:31:27 +0000 (+0200)
Subject: driver core: faux: clean up init error handling
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=1a262c768f5b5a1ebbdec8cfa588f75d3a825a8d;p=thirdparty%2Fkernel%2Flinux.git

driver core: faux: clean up init error handling

Clean up the faux bus init error handling by naming the labels after
what they do (rather than from where they are jumped to) and separating
the success path more clearly by returning explicit zero.

Signed-off-by: Johan Hovold <johan@kernel.org>
Link: https://patch.msgid.link/20260424153127.2647405-3-johan@kernel.org
Signed-off-by: Danilo Krummrich <dakr@kernel.org>
---

diff --git a/drivers/base/faux.c b/drivers/base/faux.c
index 3d1d1eafb4733..a8329f88222e3 100644
--- a/drivers/base/faux.c
+++ b/drivers/base/faux.c
@@ -244,20 +244,20 @@ int __init faux_bus_init(void)
 
 	ret = bus_register(&faux_bus_type);
 	if (ret)
-		goto error_bus;
+		goto err_deregister_root;
 
 	ret = driver_register(&faux_driver);
 	if (ret)
-		goto error_driver;
+		goto err_deregister_bus;
 
 	faux_bus_root = root;
 
-	return ret;
+	return 0;
 
-error_driver:
+err_deregister_bus:
 	bus_unregister(&faux_bus_type);
-
-error_bus:
+err_deregister_root:
 	root_device_unregister(root);
+
 	return ret;
 }