Skip to content

Commit

Permalink
HID: hidraw: make hidraw_class structure const
Browse files Browse the repository at this point in the history
Now that the driver core allows for struct class to be in read-only
memory, making all 'class' structures to be declared at build time
placing them into read-only memory, instead of having to be dynamically
allocated at load time.

Cc: Jiri Kosina <jikos@kernel.org>
Cc: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Cc: linux-input@vger.kernel.org
Cc: Ivan Orlov <ivan.orlov0322@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
  • Loading branch information
Greg Kroah-Hartman authored and Jiri Kosina committed Aug 14, 2023
1 parent fadfcf3 commit 21168bd
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions drivers/hid/hidraw.c
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@

static int hidraw_major;
static struct cdev hidraw_cdev;
static struct class *hidraw_class;
static const struct class hidraw_class = {
.name = "hidraw",
};
static struct hidraw *hidraw_table[HIDRAW_MAX_DEVICES];
static DECLARE_RWSEM(minors_rwsem);

Expand Down Expand Up @@ -329,7 +331,7 @@ static void drop_ref(struct hidraw *hidraw, int exists_bit)
hid_hw_close(hidraw->hid);
wake_up_interruptible(&hidraw->wait);
}
device_destroy(hidraw_class,
device_destroy(&hidraw_class,
MKDEV(hidraw_major, hidraw->minor));
} else {
--hidraw->open;
Expand Down Expand Up @@ -569,7 +571,7 @@ int hidraw_connect(struct hid_device *hid)
goto out;
}

dev->dev = device_create(hidraw_class, &hid->dev, MKDEV(hidraw_major, minor),
dev->dev = device_create(&hidraw_class, &hid->dev, MKDEV(hidraw_major, minor),
NULL, "%s%d", "hidraw", minor);

if (IS_ERR(dev->dev)) {
Expand Down Expand Up @@ -623,11 +625,9 @@ int __init hidraw_init(void)

hidraw_major = MAJOR(dev_id);

hidraw_class = class_create("hidraw");
if (IS_ERR(hidraw_class)) {
result = PTR_ERR(hidraw_class);
result = class_register(&hidraw_class);
if (result)
goto error_cdev;
}

cdev_init(&hidraw_cdev, &hidraw_ops);
result = cdev_add(&hidraw_cdev, dev_id, HIDRAW_MAX_DEVICES);
Expand All @@ -639,7 +639,7 @@ int __init hidraw_init(void)
return result;

error_class:
class_destroy(hidraw_class);
class_unregister(&hidraw_class);
error_cdev:
unregister_chrdev_region(dev_id, HIDRAW_MAX_DEVICES);
goto out;
Expand All @@ -650,7 +650,7 @@ void hidraw_exit(void)
dev_t dev_id = MKDEV(hidraw_major, 0);

cdev_del(&hidraw_cdev);
class_destroy(hidraw_class);
class_unregister(&hidraw_class);
unregister_chrdev_region(dev_id, HIDRAW_MAX_DEVICES);

}

0 comments on commit 21168bd

Please sign in to comment.