Skip to contentSkip to conversation

platform/loongarch: laptop: fix some issues

PATCH In review Yang Yingliang 2 participants 5 messages Oct 9, 2022

lore
Share & tools
lore
#0 lore raw

cover platform/loongarch: laptop: fix some issues

This patchset fixes some issues in error path and remove unnecessary BUG_ON() in generic_subdriver_init().

Yang Yingliang (3):
platform/loongarch: laptop: add missing platform_driver_unregister()
in generic_subdriver_exit()
platform/loongarch: laptop: add missing generic_subdriver_exit() in
generic_acpi_laptop_init()
platform/loongarch: laptop: remove unnecessary BUG_ON in
generic_subdriver_init()

 drivers/platform/loongarch/loongson-laptop.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/3 platform/loongarch: laptop: add missing platform_driver_unregister() in generic_subdriver_exit()

If setup_acpi_notify() fails in generic_subdriver_init(), platform_driver_unregister() need be called. Call it in generic_subdriver_exit().

Fixes ee7fa5029de8 ("LoongArch: Add ACPI-based generic laptop driver")
---
 drivers/platform/loongarch/loongson-laptop.c | 1 +
 1 file changed, 1 insertion(+)
drivers/platform/loongarch/loongson-laptop.c +1 -0
index e61fe7c305e0..d9f82c3991c0 100644
@@ -535,6 +535,7 @@ static void generic_subdriver_exit(struct generic_sub_driver *sub_driver)
 					   sub_driver->type, dispatch_acpi_notify);
 		sub_driver->acpi_notify_installed = 0;
 	}
+	platform_driver_unregister(sub_driver->driver);
 }
 
 static struct generic_sub_driver generic_sub_drivers[] __refdata = {
Signature · 1 line
2.25.1
#2 lore raw

PATCH 2/3 platform/loongarch: laptop: add missing generic_subdriver_exit() in generic_acpi_laptop_init()

In reply to Yang Yingliang

Add missing generic_subdriver_exit() in generic_acpi_laptop_init() in error path.

Fixes ee7fa5029de8 ("LoongArch: Add ACPI-based generic laptop driver")
---
 drivers/platform/loongarch/loongson-laptop.c | 4 ++++
 1 file changed, 4 insertions(+)
drivers/platform/loongarch/loongson-laptop.c +4 -0
index d9f82c3991c0..a9fdfac50f35 100644
@@ -582,6 +582,8 @@ static int __init generic_acpi_laptop_init(void)
 	for (i = 0; i < ARRAY_SIZE(generic_sub_drivers); i++) {
 		ret = generic_subdriver_init(&generic_sub_drivers[i]);
 		if (ret < 0) {
+			while (--i >= 0)
+				generic_subdriver_exit(&generic_sub_drivers[i]);
 			input_free_device(generic_inputdev);
 			return ret;
 		}
@@ -589,6 +591,8 @@ static int __init generic_acpi_laptop_init(void)
 
 	ret = input_register_device(generic_inputdev);
 	if (ret < 0) {
+		while (--i >= 0)
+			generic_subdriver_exit(&generic_sub_drivers[i]);
 		input_free_device(generic_inputdev);
 		pr_err("Unable to register input device\n");
 		return ret;
Signature · 1 line
2.25.1
#3 lore raw

PATCH 3/3 platform/loongarch: laptop: remove unnecessary BUG_ON in generic_subdriver_init()

In reply to Yang Yingliang

The 'sub_driver' has already be check, remove BUG_ON() to handle the fault more gracefully.

---
 drivers/platform/loongarch/loongson-laptop.c | 2 --
 1 file changed, 2 deletions(-)
drivers/platform/loongarch/loongson-laptop.c +0 -2
index a9fdfac50f35..8299195a7116 100644
@@ -498,8 +498,6 @@ static int __init generic_subdriver_init(struct generic_sub_driver *sub_driver)
 {
 	int ret;
 
-	BUG_ON(!sub_driver);
-
 	if (!sub_driver || !sub_driver->driver)
 		return -EINVAL;
 
Signature · 1 line
2.25.1
#4 lore raw
In reply to Yang Yingliang

Hi, Yingliang,

Thank you for your patch. But since the original patch is not upstream, this series will be squashed to the original one, thanks.

Huacai

Quoted 18 lines · Yang Yingliang

This patchset fixes some issues in error path and remove unnecessary BUG_ON() in generic_subdriver_init().

Yang Yingliang (3):
platform/loongarch: laptop: add missing platform_driver_unregister()
in generic_subdriver_exit()
platform/loongarch: laptop: add missing generic_subdriver_exit() in
generic_acpi_laptop_init()
platform/loongarch: laptop: remove unnecessary BUG_ON in
generic_subdriver_init()

 drivers/platform/loongarch/loongson-laptop.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

--
2.25.1