Skip to content

Commit 044a611

Browse files
ivanorlov2206gregkh
authored andcommitted
USB: roles: make role_class a static const structure
Now that the driver core allows for struct class to be in read-only memory, move the role_class structure to be declared at build time placing it into read-only memory, instead of having to be dynamically allocated at load time. Suggested-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Ivan Orlov <ivan.orlov0322@gmail.com> Link: https://lore.kernel.org/r/20230620094412.508580-7-gregkh@linuxfoundation.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 34d401a commit 044a611

1 file changed

Lines changed: 9 additions & 8 deletions

File tree

drivers/usb/roles/class.c

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@
1414
#include <linux/mutex.h>
1515
#include <linux/slab.h>
1616

17-
static struct class *role_class;
17+
static const struct class role_class = {
18+
.name = "usb_role",
19+
};
1820

1921
struct usb_role_switch {
2022
struct device dev;
@@ -95,7 +97,7 @@ static void *usb_role_switch_match(const struct fwnode_handle *fwnode, const cha
9597
if (id && !fwnode_property_present(fwnode, id))
9698
return NULL;
9799

98-
dev = class_find_device_by_fwnode(role_class, fwnode);
100+
dev = class_find_device_by_fwnode(&role_class, fwnode);
99101

100102
return dev ? to_role_switch(dev) : ERR_PTR(-EPROBE_DEFER);
101103
}
@@ -111,7 +113,7 @@ usb_role_switch_is_parent(struct fwnode_handle *fwnode)
111113
return NULL;
112114
}
113115

114-
dev = class_find_device_by_fwnode(role_class, parent);
116+
dev = class_find_device_by_fwnode(&role_class, parent);
115117
fwnode_handle_put(parent);
116118
return dev ? to_role_switch(dev) : ERR_PTR(-EPROBE_DEFER);
117119
}
@@ -191,7 +193,7 @@ usb_role_switch_find_by_fwnode(const struct fwnode_handle *fwnode)
191193
if (!fwnode)
192194
return NULL;
193195

194-
dev = class_find_device_by_fwnode(role_class, fwnode);
196+
dev = class_find_device_by_fwnode(&role_class, fwnode);
195197
if (dev)
196198
WARN_ON(!try_module_get(dev->parent->driver->owner));
197199

@@ -338,7 +340,7 @@ usb_role_switch_register(struct device *parent,
338340

339341
sw->dev.parent = parent;
340342
sw->dev.fwnode = desc->fwnode;
341-
sw->dev.class = role_class;
343+
sw->dev.class = &role_class;
342344
sw->dev.type = &usb_role_dev_type;
343345
dev_set_drvdata(&sw->dev, desc->driver_data);
344346
dev_set_name(&sw->dev, "%s-role-switch",
@@ -392,14 +394,13 @@ EXPORT_SYMBOL_GPL(usb_role_switch_get_drvdata);
392394

393395
static int __init usb_roles_init(void)
394396
{
395-
role_class = class_create("usb_role");
396-
return PTR_ERR_OR_ZERO(role_class);
397+
return class_register(&role_class);
397398
}
398399
subsys_initcall(usb_roles_init);
399400

400401
static void __exit usb_roles_exit(void)
401402
{
402-
class_destroy(role_class);
403+
class_unregister(&role_class);
403404
}
404405
module_exit(usb_roles_exit);
405406

0 commit comments

Comments
 (0)