diff options
author | John W. Linville <linville@tuxdriver.com> | 2010-05-03 14:46:05 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-05-03 14:46:37 -0400 |
commit | 1f55c12cef6d369d76ae13d522edd1c07e667788 (patch) | |
tree | 693ed1d4e7f18785765f3490697485cc182f9675 /drivers/net/wireless/iwmc3200wifi/debugfs.c | |
parent | f5c044e53a6b319776c7140b22fee9be3bc1f758 (diff) |
iwmc3200wifi: cleanup unneeded debugfs error handling
"iwl: cleanup: remove unneeded error handling" missed the one in
if_sdio_debugfs_init().
I don't think we even need to check -ENODEV ourselves because if
DEBUG_FS is not compiled in, all the debugfs utility functions will
become no-op.
Reported-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Acked-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwmc3200wifi/debugfs.c')
-rw-r--r-- | drivers/net/wireless/iwmc3200wifi/debugfs.c | 47 |
1 files changed, 10 insertions, 37 deletions
diff --git a/drivers/net/wireless/iwmc3200wifi/debugfs.c b/drivers/net/wireless/iwmc3200wifi/debugfs.c index c916152bb936..b42165c40288 100644 --- a/drivers/net/wireless/iwmc3200wifi/debugfs.c +++ b/drivers/net/wireless/iwmc3200wifi/debugfs.c | |||
@@ -47,12 +47,11 @@ static struct { | |||
47 | 47 | ||
48 | #define add_dbg_module(dbg, name, id, initlevel) \ | 48 | #define add_dbg_module(dbg, name, id, initlevel) \ |
49 | do { \ | 49 | do { \ |
50 | struct dentry *d; \ | ||
51 | dbg.dbg_module[id] = (initlevel); \ | 50 | dbg.dbg_module[id] = (initlevel); \ |
52 | d = debugfs_create_x8(name, 0600, dbg.dbgdir, \ | 51 | dbg.dbg_module_dentries[id] = \ |
53 | &(dbg.dbg_module[id])); \ | 52 | debugfs_create_x8(name, 0600, \ |
54 | if (!IS_ERR(d)) \ | 53 | dbg.dbgdir, \ |
55 | dbg.dbg_module_dentries[id] = d; \ | 54 | &(dbg.dbg_module[id])); \ |
56 | } while (0) | 55 | } while (0) |
57 | 56 | ||
58 | static int iwm_debugfs_u32_read(void *data, u64 *val) | 57 | static int iwm_debugfs_u32_read(void *data, u64 *val) |
@@ -422,37 +421,19 @@ static const struct file_operations iwm_debugfs_fw_err_fops = { | |||
422 | .read = iwm_debugfs_fw_err_read, | 421 | .read = iwm_debugfs_fw_err_read, |
423 | }; | 422 | }; |
424 | 423 | ||
425 | int iwm_debugfs_init(struct iwm_priv *iwm) | 424 | void iwm_debugfs_init(struct iwm_priv *iwm) |
426 | { | 425 | { |
427 | int i, result; | 426 | int i; |
428 | char devdir[16]; | ||
429 | 427 | ||
430 | iwm->dbg.rootdir = debugfs_create_dir(KBUILD_MODNAME, NULL); | 428 | iwm->dbg.rootdir = debugfs_create_dir(KBUILD_MODNAME, NULL); |
431 | result = PTR_ERR(iwm->dbg.rootdir); | 429 | iwm->dbg.devdir = debugfs_create_dir(wiphy_name(iwm_to_wiphy(iwm)), |
432 | if (!result || IS_ERR(iwm->dbg.rootdir)) { | 430 | iwm->dbg.rootdir); |
433 | if (result == -ENODEV) { | ||
434 | IWM_ERR(iwm, "DebugFS (CONFIG_DEBUG_FS) not " | ||
435 | "enabled in kernel config\n"); | ||
436 | result = 0; /* No debugfs support */ | ||
437 | } | ||
438 | IWM_ERR(iwm, "Couldn't create rootdir: %d\n", result); | ||
439 | goto error; | ||
440 | } | ||
441 | |||
442 | snprintf(devdir, sizeof(devdir), "%s", wiphy_name(iwm_to_wiphy(iwm))); | ||
443 | |||
444 | iwm->dbg.devdir = debugfs_create_dir(devdir, iwm->dbg.rootdir); | ||
445 | iwm->dbg.dbgdir = debugfs_create_dir("debug", iwm->dbg.devdir); | 431 | iwm->dbg.dbgdir = debugfs_create_dir("debug", iwm->dbg.devdir); |
446 | iwm->dbg.rxdir = debugfs_create_dir("rx", iwm->dbg.devdir); | 432 | iwm->dbg.rxdir = debugfs_create_dir("rx", iwm->dbg.devdir); |
447 | iwm->dbg.txdir = debugfs_create_dir("tx", iwm->dbg.devdir); | 433 | iwm->dbg.txdir = debugfs_create_dir("tx", iwm->dbg.devdir); |
448 | iwm->dbg.busdir = debugfs_create_dir("bus", iwm->dbg.devdir); | 434 | iwm->dbg.busdir = debugfs_create_dir("bus", iwm->dbg.devdir); |
449 | if (iwm->bus_ops->debugfs_init) { | 435 | if (iwm->bus_ops->debugfs_init) |
450 | result = iwm->bus_ops->debugfs_init(iwm, iwm->dbg.busdir); | 436 | iwm->bus_ops->debugfs_init(iwm, iwm->dbg.busdir); |
451 | if (result < 0) { | ||
452 | IWM_ERR(iwm, "Couldn't create bus entry: %d\n", result); | ||
453 | goto error; | ||
454 | } | ||
455 | } | ||
456 | 437 | ||
457 | iwm->dbg.dbg_level = IWM_DL_NONE; | 438 | iwm->dbg.dbg_level = IWM_DL_NONE; |
458 | iwm->dbg.dbg_level_dentry = | 439 | iwm->dbg.dbg_level_dentry = |
@@ -471,23 +452,15 @@ int iwm_debugfs_init(struct iwm_priv *iwm) | |||
471 | iwm->dbg.txq_dentry = debugfs_create_file("queues", 0200, | 452 | iwm->dbg.txq_dentry = debugfs_create_file("queues", 0200, |
472 | iwm->dbg.txdir, iwm, | 453 | iwm->dbg.txdir, iwm, |
473 | &iwm_debugfs_txq_fops); | 454 | &iwm_debugfs_txq_fops); |
474 | |||
475 | iwm->dbg.tx_credit_dentry = debugfs_create_file("credits", 0200, | 455 | iwm->dbg.tx_credit_dentry = debugfs_create_file("credits", 0200, |
476 | iwm->dbg.txdir, iwm, | 456 | iwm->dbg.txdir, iwm, |
477 | &iwm_debugfs_tx_credit_fops); | 457 | &iwm_debugfs_tx_credit_fops); |
478 | |||
479 | iwm->dbg.rx_ticket_dentry = debugfs_create_file("tickets", 0200, | 458 | iwm->dbg.rx_ticket_dentry = debugfs_create_file("tickets", 0200, |
480 | iwm->dbg.rxdir, iwm, | 459 | iwm->dbg.rxdir, iwm, |
481 | &iwm_debugfs_rx_ticket_fops); | 460 | &iwm_debugfs_rx_ticket_fops); |
482 | |||
483 | iwm->dbg.fw_err_dentry = debugfs_create_file("last_fw_err", 0200, | 461 | iwm->dbg.fw_err_dentry = debugfs_create_file("last_fw_err", 0200, |
484 | iwm->dbg.dbgdir, iwm, | 462 | iwm->dbg.dbgdir, iwm, |
485 | &iwm_debugfs_fw_err_fops); | 463 | &iwm_debugfs_fw_err_fops); |
486 | |||
487 | return 0; | ||
488 | |||
489 | error: | ||
490 | return result; | ||
491 | } | 464 | } |
492 | 465 | ||
493 | void iwm_debugfs_exit(struct iwm_priv *iwm) | 466 | void iwm_debugfs_exit(struct iwm_priv *iwm) |