summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSyed Nayyar Waris <syednwaris@gmail.com>2026-07-02 02:28:57 +0530
committerDanilo Krummrich <dakr@kernel.org>2026-07-03 23:14:59 +0200
commit0fa8e47dea17dd7899201f73cdf3d8efcbf78448 (patch)
treef80bd4ac6c4389bcf0de22f0aa12f135d1a96b60
parente7e09a8546a9e41a164378979471a4b4bd166bc7 (diff)
isa: refactor code to remove nested blocks
Remove nested blocks in isa_bus_init(). This will make the module easy-to-understand and make the code clearer. Previous discussion regarding this change can be found at below link: https://lore.kernel.org/all/20260504063518.515620-1-wbg@kernel.org/ Acked-by: William Breathitt Gray <wbg@kernel.org> Suggested-by: William Breathitt Gray <wbg@kernel.org> Signed-off-by: Syed Nayyar Waris <syednwaris@gmail.com> Acked-by: Randy Dunlap <rdunlap@infradead.org> Link: https://lore.kernel.org/all/20260504063518.515620-1-wbg@kernel.org/ Link: https://patch.msgid.link/20260701205857.GA4113@syednwaris Signed-off-by: Danilo Krummrich <dakr@kernel.org>
-rw-r--r--drivers/base/isa.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/drivers/base/isa.c b/drivers/base/isa.c
index 5887e4211f80..4e9f68080f39 100644
--- a/drivers/base/isa.c
+++ b/drivers/base/isa.c
@@ -166,14 +166,16 @@ static int __init isa_bus_init(void)
int error;
error = bus_register(&isa_bus_type);
- if (!error) {
- isa_bus = root_device_register("isa");
- if (IS_ERR(isa_bus)) {
- error = PTR_ERR(isa_bus);
- bus_unregister(&isa_bus_type);
- }
+ if (error)
+ return error;
+
+ isa_bus = root_device_register("isa");
+ if (IS_ERR(isa_bus)) {
+ bus_unregister(&isa_bus_type);
+ return PTR_ERR(isa_bus);
}
- return error;
+
+ return 0;
}
postcore_initcall(isa_bus_init);