]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
platform/x86: think-lmi: Directly use firmware_attributes_class
authorThomas Weißschuh <linux@weissschuh.net>
Fri, 3 Jan 2025 23:05:11 +0000 (00:05 +0100)
committerIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Thu, 9 Jan 2025 11:40:21 +0000 (13:40 +0200)
The usage of the lifecycle functions is not necessary anymore.

Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
Reviewed-by: Armin Wolf <W_Armin@gmx.de>
Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
Reviewed-by: Mark Pearson <mpearson-lenovo@squebb.ca>
Tested-by: Mark Pearson <mpearson-lenovo@squebb.ca>
Link: https://lore.kernel.org/r/20250104-firmware-attributes-simplify-v1-3-949f9709e405@weissschuh.net
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
drivers/platform/x86/think-lmi.c

index 38de0cb20d7785d4e3b490e07edaf4d02f8f3370..323316ac6783aa343c4c6430040a4af648786880 100644 (file)
@@ -194,7 +194,6 @@ static const char * const level_options[] = {
        [TLMI_LEVEL_MASTER] = "master",
 };
 static struct think_lmi tlmi_priv;
-static const struct class *fw_attr_class;
 static DEFINE_MUTEX(tlmi_mutex);
 
 static inline struct tlmi_pwd_setting *to_tlmi_pwd_setting(struct kobject *kobj)
@@ -1446,11 +1445,7 @@ static int tlmi_sysfs_init(void)
 {
        int i, ret;
 
-       ret = fw_attributes_class_get(&fw_attr_class);
-       if (ret)
-               return ret;
-
-       tlmi_priv.class_dev = device_create(fw_attr_class, NULL, MKDEV(0, 0),
+       tlmi_priv.class_dev = device_create(&firmware_attributes_class, NULL, MKDEV(0, 0),
                        NULL, "%s", "thinklmi");
        if (IS_ERR(tlmi_priv.class_dev)) {
                ret = PTR_ERR(tlmi_priv.class_dev);
@@ -1563,9 +1558,8 @@ static int tlmi_sysfs_init(void)
 fail_create_attr:
        tlmi_release_attr();
 fail_device_created:
-       device_destroy(fw_attr_class, MKDEV(0, 0));
+       device_destroy(&firmware_attributes_class, MKDEV(0, 0));
 fail_class_created:
-       fw_attributes_class_put();
        return ret;
 }
 
@@ -1788,8 +1782,7 @@ fail_clear_attr:
 static void tlmi_remove(struct wmi_device *wdev)
 {
        tlmi_release_attr();
-       device_destroy(fw_attr_class, MKDEV(0, 0));
-       fw_attributes_class_put();
+       device_destroy(&firmware_attributes_class, MKDEV(0, 0));
 }
 
 static int tlmi_probe(struct wmi_device *wdev, const void *context)