Re: [PATCH v2] isa: refactor code to remove nested blocks
From: Randy Dunlap
Date: Wed Jul 01 2026 - 23:17:07 EST
On July 1, 2026 1:58:57 PM PDT, Syed Nayyar Waris <syednwaris@xxxxxxxxx> wrote:
>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@xxxxxxxxxx/
>
>Acked-by: William Breathitt Gray <wbg@xxxxxxxxxx>
>Suggested-by: William Breathitt Gray <wbg@xxxxxxxxxx>
>Signed-off-by: Syed Nayyar Waris <syednwaris@xxxxxxxxx>
LGTM. Thanks.
Acked-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
>---
>Changes in v2:
> - Make the patch description more comprehensive and thorough
> in its explanation
>---
> drivers/base/isa.c | 16 +++++++++-------
> 1 file 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);
~Randy