aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/intel/iwlegacy/debug.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/intel/iwlegacy/debug.c')
-rw-r--r--drivers/net/wireless/intel/iwlegacy/debug.c34
1 files changed, 4 insertions, 30 deletions
diff --git a/drivers/net/wireless/intel/iwlegacy/debug.c b/drivers/net/wireless/intel/iwlegacy/debug.c
index d76073def677..fa211412e0ac 100644
--- a/drivers/net/wireless/intel/iwlegacy/debug.c
+++ b/drivers/net/wireless/intel/iwlegacy/debug.c
@@ -128,23 +128,12 @@ EXPORT_SYMBOL(il_update_stats);
128 128
129/* create and remove of files */ 129/* create and remove of files */
130#define DEBUGFS_ADD_FILE(name, parent, mode) do { \ 130#define DEBUGFS_ADD_FILE(name, parent, mode) do { \
131 if (!debugfs_create_file(#name, mode, parent, il, \ 131 debugfs_create_file(#name, mode, parent, il, \
132 &il_dbgfs_##name##_ops)) \ 132 &il_dbgfs_##name##_ops); \
133 goto err; \
134} while (0) 133} while (0)
135 134
136#define DEBUGFS_ADD_BOOL(name, parent, ptr) do { \ 135#define DEBUGFS_ADD_BOOL(name, parent, ptr) do { \
137 struct dentry *__tmp; \ 136 debugfs_create_bool(#name, 0600, parent, ptr); \
138 __tmp = debugfs_create_bool(#name, 0600, parent, ptr); \
139 if (IS_ERR(__tmp) || !__tmp) \
140 goto err; \
141} while (0)
142
143#define DEBUGFS_ADD_X32(name, parent, ptr) do { \
144 struct dentry *__tmp; \
145 __tmp = debugfs_create_x32(#name, 0600, parent, ptr); \
146 if (IS_ERR(__tmp) || !__tmp) \
147 goto err; \
148} while (0) 137} while (0)
149 138
150/* file operation */ 139/* file operation */
@@ -1341,27 +1330,18 @@ DEBUGFS_WRITE_FILE_OPS(wd_timeout);
1341 * Create the debugfs files and directories 1330 * Create the debugfs files and directories
1342 * 1331 *
1343 */ 1332 */
1344int 1333void
1345il_dbgfs_register(struct il_priv *il, const char *name) 1334il_dbgfs_register(struct il_priv *il, const char *name)
1346{ 1335{
1347 struct dentry *phyd = il->hw->wiphy->debugfsdir; 1336 struct dentry *phyd = il->hw->wiphy->debugfsdir;
1348 struct dentry *dir_drv, *dir_data, *dir_rf, *dir_debug; 1337 struct dentry *dir_drv, *dir_data, *dir_rf, *dir_debug;
1349 1338
1350 dir_drv = debugfs_create_dir(name, phyd); 1339 dir_drv = debugfs_create_dir(name, phyd);
1351 if (!dir_drv)
1352 return -ENOMEM;
1353
1354 il->debugfs_dir = dir_drv; 1340 il->debugfs_dir = dir_drv;
1355 1341
1356 dir_data = debugfs_create_dir("data", dir_drv); 1342 dir_data = debugfs_create_dir("data", dir_drv);
1357 if (!dir_data)
1358 goto err;
1359 dir_rf = debugfs_create_dir("rf", dir_drv); 1343 dir_rf = debugfs_create_dir("rf", dir_drv);
1360 if (!dir_rf)
1361 goto err;
1362 dir_debug = debugfs_create_dir("debug", dir_drv); 1344 dir_debug = debugfs_create_dir("debug", dir_drv);
1363 if (!dir_debug)
1364 goto err;
1365 1345
1366 DEBUGFS_ADD_FILE(nvm, dir_data, 0400); 1346 DEBUGFS_ADD_FILE(nvm, dir_data, 0400);
1367 DEBUGFS_ADD_FILE(sram, dir_data, 0600); 1347 DEBUGFS_ADD_FILE(sram, dir_data, 0600);
@@ -1399,12 +1379,6 @@ il_dbgfs_register(struct il_priv *il, const char *name)
1399 DEBUGFS_ADD_BOOL(disable_chain_noise, dir_rf, 1379 DEBUGFS_ADD_BOOL(disable_chain_noise, dir_rf,
1400 &il->disable_chain_noise_cal); 1380 &il->disable_chain_noise_cal);
1401 DEBUGFS_ADD_BOOL(disable_tx_power, dir_rf, &il->disable_tx_power_cal); 1381 DEBUGFS_ADD_BOOL(disable_tx_power, dir_rf, &il->disable_tx_power_cal);
1402 return 0;
1403
1404err:
1405 IL_ERR("Can't create the debugfs directory\n");
1406 il_dbgfs_unregister(il);
1407 return -ENOMEM;
1408} 1382}
1409EXPORT_SYMBOL(il_dbgfs_register); 1383EXPORT_SYMBOL(il_dbgfs_register);
1410 1384