[PATCH v2 2/2] driver core: faux: clean up init error handling
From: Johan Hovold
Date: Fri Apr 24 2026 - 11:33:37 EST
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@xxxxxxxxxx>
---
drivers/base/faux.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/base/faux.c b/drivers/base/faux.c
index 3d1d1eafb473..a8329f88222e 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;
}
--
2.53.0