Skip to content

Commit cda12ba

Browse files
rbmarlierelag-linaro
authored andcommitted
backlight: Make backlight_class constant
Since commit 43a7206 ("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 backlight_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: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Ricardo B. Marliere <ricardo@marliere.net> Reviewed-by: Daniel Thompson <daniel.thompson@linaro.org> Link: https://lore.kernel.org/r/20240305-class_cleanup-backlight-v1-1-c0e15cc25be1@marliere.net Signed-off-by: Lee Jones <lee@kernel.org>
1 parent e962f13 commit cda12ba

File tree

1 file changed

+16
-13
lines changed

1 file changed

+16
-13
lines changed

drivers/video/backlight/backlight.c

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -319,8 +319,6 @@ static ssize_t scale_show(struct device *dev,
319319
}
320320
static DEVICE_ATTR_RO(scale);
321321

322-
static struct class *backlight_class;
323-
324322
#ifdef CONFIG_PM_SLEEP
325323
static int backlight_suspend(struct device *dev)
326324
{
@@ -371,6 +369,12 @@ static struct attribute *bl_device_attrs[] = {
371369
};
372370
ATTRIBUTE_GROUPS(bl_device);
373371

372+
static const struct class backlight_class = {
373+
.name = "backlight",
374+
.dev_groups = bl_device_groups,
375+
.pm = &backlight_class_dev_pm_ops,
376+
};
377+
374378
/**
375379
* backlight_force_update - tell the backlight subsystem that hardware state
376380
* has changed
@@ -420,7 +424,7 @@ struct backlight_device *backlight_device_register(const char *name,
420424
mutex_init(&new_bd->update_lock);
421425
mutex_init(&new_bd->ops_lock);
422426

423-
new_bd->dev.class = backlight_class;
427+
new_bd->dev.class = &backlight_class;
424428
new_bd->dev.parent = parent;
425429
new_bd->dev.release = bl_device_release;
426430
dev_set_name(&new_bd->dev, "%s", name);
@@ -512,7 +516,7 @@ struct backlight_device *backlight_device_get_by_name(const char *name)
512516
{
513517
struct device *dev;
514518

515-
dev = class_find_device_by_name(backlight_class, name);
519+
dev = class_find_device_by_name(&backlight_class, name);
516520

517521
return dev ? to_backlight_device(dev) : NULL;
518522
}
@@ -680,7 +684,7 @@ struct backlight_device *of_find_backlight_by_node(struct device_node *node)
680684
{
681685
struct device *dev;
682686

683-
dev = class_find_device(backlight_class, NULL, node, of_parent_match);
687+
dev = class_find_device(&backlight_class, NULL, node, of_parent_match);
684688

685689
return dev ? to_backlight_device(dev) : NULL;
686690
}
@@ -748,20 +752,19 @@ EXPORT_SYMBOL(devm_of_find_backlight);
748752

749753
static void __exit backlight_class_exit(void)
750754
{
751-
class_destroy(backlight_class);
755+
class_unregister(&backlight_class);
752756
}
753757

754758
static int __init backlight_class_init(void)
755759
{
756-
backlight_class = class_create("backlight");
757-
if (IS_ERR(backlight_class)) {
758-
pr_warn("Unable to create backlight class; errno = %ld\n",
759-
PTR_ERR(backlight_class));
760-
return PTR_ERR(backlight_class);
760+
int ret;
761+
762+
ret = class_register(&backlight_class);
763+
if (ret) {
764+
pr_warn("Unable to create backlight class; errno = %d\n", ret);
765+
return ret;
761766
}
762767

763-
backlight_class->dev_groups = bl_device_groups;
764-
backlight_class->pm = &backlight_class_dev_pm_ops;
765768
INIT_LIST_HEAD(&backlight_dev_list);
766769
mutex_init(&backlight_dev_list_mutex);
767770
BLOCKING_INIT_NOTIFIER_HEAD(&backlight_notifier);

0 commit comments

Comments
 (0)