Commit 6d3b27e0 authored by Ricardo B. Marliere's avatar Ricardo B. Marliere Committed by Alex Deucher

drm/amdkfd: make kfd_class constant

Since commit 43a7206b ("driver core: class: make class_register() take
a const *"), the driver core allows for struct class to be in read-only
memory, so move the kfd_class structure to be declared at build time
placing it into read-only memory, instead of having to be dynamically
allocated at boot time.

Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Suggested-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarRicardo B. Marliere <ricardo@marliere.net>
Signed-off-by: default avatarFelix Kuehling <felix.kuehling@amd.com>
Reviewed-by: default avatarFelix Kuehling <felix.kuehling@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 5e592956
...@@ -63,8 +63,10 @@ static const struct file_operations kfd_fops = { ...@@ -63,8 +63,10 @@ static const struct file_operations kfd_fops = {
}; };
static int kfd_char_dev_major = -1; static int kfd_char_dev_major = -1;
static struct class *kfd_class;
struct device *kfd_device; struct device *kfd_device;
static const struct class kfd_class = {
.name = kfd_dev_name,
};
static inline struct kfd_process_device *kfd_lock_pdd_by_id(struct kfd_process *p, __u32 gpu_id) static inline struct kfd_process_device *kfd_lock_pdd_by_id(struct kfd_process *p, __u32 gpu_id)
{ {
...@@ -94,14 +96,13 @@ int kfd_chardev_init(void) ...@@ -94,14 +96,13 @@ int kfd_chardev_init(void)
if (err < 0) if (err < 0)
goto err_register_chrdev; goto err_register_chrdev;
kfd_class = class_create(kfd_dev_name); err = class_register(&kfd_class);
err = PTR_ERR(kfd_class); if (err)
if (IS_ERR(kfd_class))
goto err_class_create; goto err_class_create;
kfd_device = device_create(kfd_class, NULL, kfd_device = device_create(&kfd_class, NULL,
MKDEV(kfd_char_dev_major, 0), MKDEV(kfd_char_dev_major, 0),
NULL, kfd_dev_name); NULL, kfd_dev_name);
err = PTR_ERR(kfd_device); err = PTR_ERR(kfd_device);
if (IS_ERR(kfd_device)) if (IS_ERR(kfd_device))
goto err_device_create; goto err_device_create;
...@@ -109,7 +110,7 @@ int kfd_chardev_init(void) ...@@ -109,7 +110,7 @@ int kfd_chardev_init(void)
return 0; return 0;
err_device_create: err_device_create:
class_destroy(kfd_class); class_unregister(&kfd_class);
err_class_create: err_class_create:
unregister_chrdev(kfd_char_dev_major, kfd_dev_name); unregister_chrdev(kfd_char_dev_major, kfd_dev_name);
err_register_chrdev: err_register_chrdev:
...@@ -118,8 +119,8 @@ int kfd_chardev_init(void) ...@@ -118,8 +119,8 @@ int kfd_chardev_init(void)
void kfd_chardev_exit(void) void kfd_chardev_exit(void)
{ {
device_destroy(kfd_class, MKDEV(kfd_char_dev_major, 0)); device_destroy(&kfd_class, MKDEV(kfd_char_dev_major, 0));
class_destroy(kfd_class); class_unregister(&kfd_class);
unregister_chrdev(kfd_char_dev_major, kfd_dev_name); unregister_chrdev(kfd_char_dev_major, kfd_dev_name);
kfd_device = NULL; kfd_device = NULL;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment