.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)
        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);
        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;
 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();
 }