Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Bluetooth: Use IS_ERR_OR_NULL for checking bt_debugfs

Browse source 
Make sure to use IS_ERR_OR_NULL for checking the existing of the root
debugfs dentry bt_debugfs.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
This commit is contained in:
Marcel Holtmann 2013-10-17 17:24:16 -07:00 committed by Johan Hedberg
parent 47219839b4
commit 1120e4bfa5
4 changed files with 25 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
net/bluetooth/l2cap_core.c
View file

@ -6833,12 +6833,11 @@ int __init l2cap_init(void)
if (err < 0) if (err < 0)
return err; return err;
if (bt_debugfs) { if (IS_ERR_OR_NULL(bt_debugfs))
l2cap_debugfs = debugfs_create_file("l2cap", 0444, bt_debugfs, return 0;
NULL, &l2cap_debugfs_fops);
if (!l2cap_debugfs) l2cap_debugfs = debugfs_create_file("l2cap", 0444, bt_debugfs,
BT_ERR("Failed to create L2CAP debug file"); NULL, &l2cap_debugfs_fops);
}
return 0; return 0;
} }

14
net/bluetooth/rfcomm/core.c
View file

@ -2154,13 +2154,6 @@ static int __init rfcomm_init(void)
goto unregister; goto unregister;
} }
if (bt_debugfs) {
rfcomm_dlc_debugfs = debugfs_create_file("rfcomm_dlc", 0444,
bt_debugfs, NULL, &rfcomm_dlc_debugfs_fops);
if (!rfcomm_dlc_debugfs)
BT_ERR("Failed to create RFCOMM debug file");
}
err = rfcomm_init_ttys(); err = rfcomm_init_ttys();
if (err < 0) if (err < 0)
goto stop; goto stop;
@ -2171,6 +2164,13 @@ static int __init rfcomm_init(void)
BT_INFO("RFCOMM ver %s", VERSION); BT_INFO("RFCOMM ver %s", VERSION);
if (IS_ERR_OR_NULL(bt_debugfs))
return 0;
rfcomm_dlc_debugfs = debugfs_create_file("rfcomm_dlc", 0444,
bt_debugfs, NULL,
&rfcomm_dlc_debugfs_fops);
return 0; return 0;
cleanup: cleanup:

14
net/bluetooth/rfcomm/sock.c
View file

@ -1051,15 +1051,15 @@ int __init rfcomm_init_sockets(void)
goto error; goto error;
} }
if (bt_debugfs) {
rfcomm_sock_debugfs = debugfs_create_file("rfcomm", 0444,
bt_debugfs, NULL, &rfcomm_sock_debugfs_fops);
if (!rfcomm_sock_debugfs)
BT_ERR("Failed to create RFCOMM debug file");
}
BT_INFO("RFCOMM socket layer initialized"); BT_INFO("RFCOMM socket layer initialized");
if (IS_ERR_OR_NULL(bt_debugfs))
return 0;
rfcomm_sock_debugfs = debugfs_create_file("rfcomm", 0444,
bt_debugfs, NULL,
&rfcomm_sock_debugfs_fops);
return 0; return 0;
error: error:

13
net/bluetooth/sco.c
View file

@ -1177,15 +1177,14 @@ int __init sco_init(void)
goto error; goto error;
} }
if (bt_debugfs) {
sco_debugfs = debugfs_create_file("sco", 0444, bt_debugfs,
NULL, &sco_debugfs_fops);
if (!sco_debugfs)
BT_ERR("Failed to create SCO debug file");
}
BT_INFO("SCO socket layer initialized"); BT_INFO("SCO socket layer initialized");
if (IS_ERR_OR_NULL(bt_debugfs))
return 0;
sco_debugfs = debugfs_create_file("sco", 0444, bt_debugfs,
NULL, &sco_debugfs_fops);
return 0; return 0;
error: error: