diff options
| author | Hans de Goede <hansg@kernel.org> | 2025-09-20 22:07:07 +0200 |
|---|---|---|
| committer | Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> | 2025-09-26 14:26:34 +0300 |
| commit | 2bb596a7d2375d2a2218b0cc5b028f0f86e9fed9 (patch) | |
| tree | c4a536996c5bc79f151fc972278d69f75eea38fa | |
| parent | 936ddb5398909d9e1255627386bc090ec8943558 (diff) | |
platform/x86: x86-android-tablets: Simplify node-group [un]registration
software_node_register_node_group() / software_node_unregister_node_group()
both accept a NULL node-group as argument.
So there is no need to check for the node-group being NULL before calling
these functions, remove the checks to simplify the code.
Note the "if (gpio_button_swnodes)" check for registering is kept because
that also guards the creation of a gpio-button platform-device.
Suggested-by: Andy Shevchenko <andy@kernel.org>
Signed-off-by: Hans de Goede <hansg@kernel.org>
Reviewed-by: Andy Shevchenko <andy@kernel.org>
Link: https://patch.msgid.link/20250920200713.20193-15-hansg@kernel.org
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
| -rw-r--r-- | drivers/platform/x86/x86-android-tablets/core.c | 31 |
1 files changed, 11 insertions, 20 deletions
diff --git a/drivers/platform/x86/x86-android-tablets/core.c b/drivers/platform/x86/x86-android-tablets/core.c index 5675e888d84f..d0638664d1da 100644 --- a/drivers/platform/x86/x86-android-tablets/core.c +++ b/drivers/platform/x86/x86-android-tablets/core.c @@ -387,14 +387,9 @@ static void x86_android_tablet_remove(struct platform_device *pdev) if (exit_handler) exit_handler(); - if (gpio_button_swnodes) - software_node_unregister_node_group(gpio_button_swnodes); - - if (swnode_group) - software_node_unregister_node_group(swnode_group); - - if (gpiochip_node_group) - software_node_unregister_node_group(gpiochip_node_group); + software_node_unregister_node_group(gpio_button_swnodes); + software_node_unregister_node_group(swnode_group); + software_node_unregister_node_group(gpiochip_node_group); } static __init int x86_android_tablet_probe(struct platform_device *pdev) @@ -430,20 +425,16 @@ static __init int x86_android_tablet_probe(struct platform_device *pdev) break; } - if (gpiochip_node_group) { - ret = software_node_register_node_group(gpiochip_node_group); - if (ret) - return ret; - } + ret = software_node_register_node_group(gpiochip_node_group); + if (ret) + return ret; - if (dev_info->swnode_group) { - ret = software_node_register_node_group(dev_info->swnode_group); - if (ret) { - x86_android_tablet_remove(pdev); - return ret; - } - swnode_group = dev_info->swnode_group; + ret = software_node_register_node_group(dev_info->swnode_group); + if (ret) { + x86_android_tablet_remove(pdev); + return ret; } + swnode_group = dev_info->swnode_group; if (dev_info->init) { ret = dev_info->init(&pdev->dev); |