]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
platform/x86: hp-bioscfg: Directly use firmware_attributes_class
authorThomas Weißschuh <linux@weissschuh.net>
Fri, 3 Jan 2025 23:05:12 +0000 (00:05 +0100)
committerIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Thu, 9 Jan 2025 11:40:24 +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-4-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/hp/hp-bioscfg/bioscfg.c

index 2dc50152158a3dd0401d9d9e1de288c0d76ef937..0b277b7e37dd6b598e4fe5de6dc0ac47300a8e3b 100644 (file)
@@ -24,8 +24,6 @@ struct bioscfg_priv bioscfg_drv = {
        .mutex = __MUTEX_INITIALIZER(bioscfg_drv.mutex),
 };
 
-static const struct class *fw_attr_class;
-
 ssize_t display_name_language_code_show(struct kobject *kobj,
                                        struct kobj_attribute *attr,
                                        char *buf)
@@ -972,11 +970,7 @@ static int __init hp_init(void)
        if (ret)
                return ret;
 
-       ret = fw_attributes_class_get(&fw_attr_class);
-       if (ret)
-               goto err_unregister_class;
-
-       bioscfg_drv.class_dev = device_create(fw_attr_class, NULL, MKDEV(0, 0),
+       bioscfg_drv.class_dev = device_create(&firmware_attributes_class, NULL, MKDEV(0, 0),
                                              NULL, "%s", DRIVER_NAME);
        if (IS_ERR(bioscfg_drv.class_dev)) {
                ret = PTR_ERR(bioscfg_drv.class_dev);
@@ -1043,10 +1037,9 @@ err_release_attributes_data:
        release_attributes_data();
 
 err_destroy_classdev:
-       device_destroy(fw_attr_class, MKDEV(0, 0));
+       device_destroy(&firmware_attributes_class, MKDEV(0, 0));
 
 err_unregister_class:
-       fw_attributes_class_put();
        hp_exit_attr_set_interface();
 
        return ret;
@@ -1055,9 +1048,8 @@ err_unregister_class:
 static void __exit hp_exit(void)
 {
        release_attributes_data();
-       device_destroy(fw_attr_class, MKDEV(0, 0));
+       device_destroy(&firmware_attributes_class, MKDEV(0, 0));
 
-       fw_attributes_class_put();
        hp_exit_attr_set_interface();
 }