TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

platform/x86: x86-android-tablets: Simplify node-group [un]registration

Browse Source 
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>
This commit is contained in:
Hans de Goede
2025-09-20 22:07:07 +02:00
committed by Ilpo Järvinen
parent 936ddb5398
commit 2bb596a7d2
1 changed files with 11 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/platform/x86/x86-android-tablets/core.c
+11 -20
View File
@@ -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);