Re: [PATCH v8 02/22] platform/x86/dell: dell-pc: Create platform device

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Am 30.11.24 um 15:04 schrieb Mario Limonciello:

In order to have a device for the platform profile core to reference
create a platform device for dell-pc.

While doing this change the memory allocation for the thermal handler
to be device managed to follow the lifecycle of that device.

Reviewed-by: Armin Wolf <W_Armin@xxxxxx>
Tested-by: Mark Pearson <mpearson-lenovo@xxxxxxxxx>
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxxxxxx>
Reviewed-by: Mark Pearson <mpearson-lenovo@xxxxxxxxx>
Signed-off-by: Mario Limonciello <mario.limonciello@xxxxxxx>
---
v8:
  * Use IS_ERR()/ERR_PTR()
---
  drivers/platform/x86/dell/dell-pc.c | 34 ++++++++++++++++++++---------
  1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/drivers/platform/x86/dell/dell-pc.c b/drivers/platform/x86/dell/dell-pc.c
index 3cf79e55e3129..8bacbde0f0506 100644
--- a/drivers/platform/x86/dell/dell-pc.c
+++ b/drivers/platform/x86/dell/dell-pc.c
@@ -18,10 +18,13 @@
  #include <linux/kernel.h>
  #include <linux/module.h>
  #include <linux/platform_profile.h>
+#include <linux/platform_device.h>
  #include <linux/slab.h>

  #include "dell-smbios.h"

+static struct platform_device *platform_device;
+
  static const struct dmi_system_id dell_device_table[] __initconst = {
  	{
  		.ident = "Dell Inc.",
@@ -244,9 +247,15 @@ static int thermal_init(void)
  	if (!supported_modes)
  		return 0;

-	thermal_handler = kzalloc(sizeof(*thermal_handler), GFP_KERNEL);
-	if (!thermal_handler)
-		return -ENOMEM;
+	platform_device = platform_device_register_simple("dell-pc", PLATFORM_DEVID_NONE, NULL, 0);
+	if (IS_ERR(platform_device))
+		return ERR_PTR(platform_device);

ERR_PTR() -> PTR_ERR()

With that being fixed:

Reviewed-by: Armin Wolf <W_Armin@xxxxxx>

+
+	thermal_handler = devm_kzalloc(&platform_device->dev, sizeof(*thermal_handler), GFP_KERNEL);
+	if (!thermal_handler) {
+		ret = -ENOMEM;
+		goto cleanup_platform_device;
+	}
  	thermal_handler->name = "dell-pc";
  	thermal_handler->profile_get = thermal_platform_profile_get;
  	thermal_handler->profile_set = thermal_platform_profile_set;
@@ -262,20 +271,25 @@ static int thermal_init(void)

  	/* Clean up if failed */
  	ret = platform_profile_register(thermal_handler);
-	if (ret) {
-		kfree(thermal_handler);
-		thermal_handler = NULL;
-	}
+	if (ret)
+		goto cleanup_thermal_handler;
+
+	return 0;
+
+cleanup_thermal_handler:
+	thermal_handler = NULL;
+
+cleanup_platform_device:
+	platform_device_unregister(platform_device);

  	return ret;
  }

  static void thermal_cleanup(void)
  {
-	if (thermal_handler) {
+	if (thermal_handler)
  		platform_profile_remove();
-		kfree(thermal_handler);
-	}
+	platform_device_unregister(platform_device);
  }

  static int __init dell_init(void)





[Index of Archives]     [Linux IBM ACPI]     [Linux Power Management]     [Linux Kernel]     [Linux Laptop]     [Kernel Newbies]     [Share Photos]     [Security]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Samba]     [Video 4 Linux]     [Device Mapper]     [Linux Resources]
  Powered by Linux