Skip to content

Commit 479b4bc

Browse files
rbmarlierekuba-moo
authored andcommitted
isdn: mISDN: make elements_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 elements_class structure to be declared at build time placing it into read-only memory, instead of having to be dynamically allocated at boot time. Suggested-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Ricardo B. Marliere <ricardo@marliere.net> Reviewed-by: Simon Horman <horms@kernel.org> Link: https://lore.kernel.org/r/20240305-class_cleanup-isdn-v1-1-6f0edca75b61@marliere.net Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent b724132 commit 479b4bc

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

drivers/isdn/mISDN/dsp_pipeline.c

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@ struct dsp_element_entry {
3131
static LIST_HEAD(dsp_elements);
3232

3333
/* sysfs */
34-
static struct class *elements_class;
34+
static const struct class elements_class = {
35+
.name = "dsp_pipeline",
36+
};
3537

3638
static ssize_t
3739
attr_show_args(struct device *dev, struct device_attribute *attr, char *buf)
@@ -80,7 +82,7 @@ int mISDN_dsp_element_register(struct mISDN_dsp_element *elem)
8082
INIT_LIST_HEAD(&entry->list);
8183
entry->elem = elem;
8284

83-
entry->dev.class = elements_class;
85+
entry->dev.class = &elements_class;
8486
entry->dev.release = mISDN_dsp_dev_release;
8587
dev_set_drvdata(&entry->dev, elem);
8688
dev_set_name(&entry->dev, "%s", elem->name);
@@ -131,9 +133,11 @@ EXPORT_SYMBOL(mISDN_dsp_element_unregister);
131133

132134
int dsp_pipeline_module_init(void)
133135
{
134-
elements_class = class_create("dsp_pipeline");
135-
if (IS_ERR(elements_class))
136-
return PTR_ERR(elements_class);
136+
int err;
137+
138+
err = class_register(&elements_class);
139+
if (err)
140+
return err;
137141

138142
dsp_hwec_init();
139143

@@ -146,7 +150,7 @@ void dsp_pipeline_module_exit(void)
146150

147151
dsp_hwec_exit();
148152

149-
class_destroy(elements_class);
153+
class_unregister(&elements_class);
150154

151155
list_for_each_entry_safe(entry, n, &dsp_elements, list) {
152156
list_del(&entry->list);

0 commit comments

Comments
 (0)