UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Bluetooth: hci_sysfs: make bt_class a static const structure 

Now that the driver core allows for struct class to be in read-only
memory, move the bt_class structure to be declared at build time
placing it into read-only memory, instead of having to be dynamically
allocated at load time.

Cc: Marcel Holtmann <marcel@holtmann.org>
Cc: Johan Hedberg <johan.hedberg@gmail.com>
Cc: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
Cc: linux-bluetooth@vger.kernel.org
Suggested-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Ivan Orlov <ivan.orlov0322@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Ivan Orlov 2023-06-20 16:40:52 +02:00 committed by Jakub Kicinski
parent 14f0dceca6
commit d40d6f52d5
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
net/bluetooth/hci_sysfs.c
View File

@ -6,7 +6,9 @@
#include <net/bluetooth/bluetooth.h> #include <net/bluetooth/bluetooth.h>
#include <net/bluetooth/hci_core.h> #include <net/bluetooth/hci_core.h>
static struct class *bt_class; static const struct class bt_class = {
.name = "bluetooth",
};
static void bt_link_release(struct device *dev) static void bt_link_release(struct device *dev)
{ {
@ -36,7 +38,7 @@ void hci_conn_init_sysfs(struct hci_conn *conn)
BT_DBG("conn %p", conn); BT_DBG("conn %p", conn);
conn->dev.type = &bt_link; conn->dev.type = &bt_link;
conn->dev.class = bt_class; conn->dev.class = &bt_class;
conn->dev.parent = &hdev->dev; conn->dev.parent = &hdev->dev;
device_initialize(&conn->dev); device_initialize(&conn->dev);
@ -104,7 +106,7 @@ void hci_init_sysfs(struct hci_dev *hdev)
struct device *dev = &hdev->dev; struct device *dev = &hdev->dev;
dev->type = &bt_host; dev->type = &bt_host;
dev->class = bt_class; dev->class = &bt_class;
__module_get(THIS_MODULE); __module_get(THIS_MODULE);
device_initialize(dev); device_initialize(dev);
@ -112,12 +114,10 @@ void hci_init_sysfs(struct hci_dev *hdev)
int __init bt_sysfs_init(void) int __init bt_sysfs_init(void)
{ {
bt_class = class_create("bluetooth"); return class_register(&bt_class);
return PTR_ERR_OR_ZERO(bt_class);
} }
void bt_sysfs_cleanup(void) void bt_sysfs_cleanup(void)
{ {
class_destroy(bt_class); class_unregister(&bt_class);
} }