diff options
Diffstat (limited to 'drivers/net/wireless/iwmc3200wifi/sdio.c')
-rw-r--r-- | drivers/net/wireless/iwmc3200wifi/sdio.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/drivers/net/wireless/iwmc3200wifi/sdio.c b/drivers/net/wireless/iwmc3200wifi/sdio.c index 1eafd6dec3fd..1acea37f39f8 100644 --- a/drivers/net/wireless/iwmc3200wifi/sdio.c +++ b/drivers/net/wireless/iwmc3200wifi/sdio.c | |||
@@ -366,21 +366,13 @@ static const struct file_operations iwm_debugfs_sdio_fops = { | |||
366 | .read = iwm_debugfs_sdio_read, | 366 | .read = iwm_debugfs_sdio_read, |
367 | }; | 367 | }; |
368 | 368 | ||
369 | static int if_sdio_debugfs_init(struct iwm_priv *iwm, struct dentry *parent_dir) | 369 | static void if_sdio_debugfs_init(struct iwm_priv *iwm, struct dentry *parent_dir) |
370 | { | 370 | { |
371 | int result; | ||
372 | struct iwm_sdio_priv *hw = iwm_to_if_sdio(iwm); | 371 | struct iwm_sdio_priv *hw = iwm_to_if_sdio(iwm); |
373 | 372 | ||
374 | hw->cccr_dentry = debugfs_create_file("cccr", 0200, | 373 | hw->cccr_dentry = debugfs_create_file("cccr", 0200, |
375 | parent_dir, iwm, | 374 | parent_dir, iwm, |
376 | &iwm_debugfs_sdio_fops); | 375 | &iwm_debugfs_sdio_fops); |
377 | result = PTR_ERR(hw->cccr_dentry); | ||
378 | if (IS_ERR(hw->cccr_dentry) && (result != -ENODEV)) { | ||
379 | IWM_ERR(iwm, "Couldn't create CCCR entry: %d\n", result); | ||
380 | return result; | ||
381 | } | ||
382 | |||
383 | return 0; | ||
384 | } | 376 | } |
385 | 377 | ||
386 | static void if_sdio_debugfs_exit(struct iwm_priv *iwm) | 378 | static void if_sdio_debugfs_exit(struct iwm_priv *iwm) |
@@ -440,11 +432,7 @@ static int iwm_sdio_probe(struct sdio_func *func, | |||
440 | hw = iwm_private(iwm); | 432 | hw = iwm_private(iwm); |
441 | hw->iwm = iwm; | 433 | hw->iwm = iwm; |
442 | 434 | ||
443 | ret = iwm_debugfs_init(iwm); | 435 | iwm_debugfs_init(iwm); |
444 | if (ret < 0) { | ||
445 | IWM_ERR(iwm, "Debugfs registration failed\n"); | ||
446 | goto if_free; | ||
447 | } | ||
448 | 436 | ||
449 | sdio_set_drvdata(func, hw); | 437 | sdio_set_drvdata(func, hw); |
450 | 438 | ||
@@ -473,7 +461,6 @@ static int iwm_sdio_probe(struct sdio_func *func, | |||
473 | destroy_workqueue(hw->isr_wq); | 461 | destroy_workqueue(hw->isr_wq); |
474 | debugfs_exit: | 462 | debugfs_exit: |
475 | iwm_debugfs_exit(iwm); | 463 | iwm_debugfs_exit(iwm); |
476 | if_free: | ||
477 | iwm_if_free(iwm); | 464 | iwm_if_free(iwm); |
478 | return ret; | 465 | return ret; |
479 | } | 466 | } |