Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ffcecac6 authored by Marcel Holtmann's avatar Marcel Holtmann Committed by Johan Hedberg
Browse files

Bluetooth: Create root debugfs directory during module init 



Create the root Bluetooth debugfs directory during module init
and remove it on module exit.

Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent 0153e2ec

net/bluetooth/af_bluetooth.c

+8 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
/* Bluetooth address family and sockets. */



#include <linux/module.h>

#include <linux/debugfs.h>

#include <asm/ioctls.h>



#include <net/bluetooth/bluetooth.h>
@@ -708,12 +709,17 @@ static struct net_proto_family bt_sock_family_ops = { 
	.create	= bt_sock_create,

};



struct dentry *bt_debugfs;

EXPORT_SYMBOL_GPL(bt_debugfs);



static int __init bt_init(void)

{

	int err;



	BT_INFO("Core ver %s", VERSION);



	bt_debugfs = debugfs_create_dir("bluetooth", NULL);



	err = bt_sysfs_init();

	if (err < 0)

		return err;
@@ -754,7 +760,6 @@ error: 


static void __exit bt_exit(void)

{



	sco_exit();



	l2cap_exit();
@@ -764,6 +769,8 @@ static void __exit bt_exit(void) 
	sock_unregister(PF_BLUETOOTH);



	bt_sysfs_cleanup();



	debugfs_remove_recursive(bt_debugfs);

}



subsys_initcall(bt_init);

net/bluetooth/hci_sysfs.c

+0 −8
Original line number Diff line number Diff line 
/* Bluetooth HCI driver model support. */



#include <linux/debugfs.h>

#include <linux/module.h>



#include <net/bluetooth/bluetooth.h>
@@ -8,9 +7,6 @@ 


static struct class *bt_class;



struct dentry *bt_debugfs;

EXPORT_SYMBOL_GPL(bt_debugfs);



static inline char *link_typetostr(int type)

{

	switch (type) {
@@ -426,8 +422,6 @@ void hci_del_sysfs(struct hci_dev *hdev) 


int __init bt_sysfs_init(void)

{

	bt_debugfs = debugfs_create_dir("bluetooth", NULL);



	bt_class = class_create(THIS_MODULE, "bluetooth");



	return PTR_ERR_OR_ZERO(bt_class);
@@ -436,6 +430,4 @@ int __init bt_sysfs_init(void) 
void bt_sysfs_cleanup(void)

{

	class_destroy(bt_class);



	debugfs_remove_recursive(bt_debugfs);

}