Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[pandora-kernel.git] / drivers / net / wireless / iwmc3200wifi / sdio.c

diff --git a/drivers/net/wireless/iwmc3200wifi/sdio.c b/drivers/net/wireless/iwmc3200wifi/sdio.c
index 1eafd6d..1acea37 100644 (file)
--- 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 = {
        .read =         iwm_debugfs_sdio_read,
 };
 
-static int if_sdio_debugfs_init(struct iwm_priv *iwm, struct dentry *parent_dir)
+static void if_sdio_debugfs_init(struct iwm_priv *iwm, struct dentry *parent_dir)
 {
-       int result;
        struct iwm_sdio_priv *hw = iwm_to_if_sdio(iwm);
 
        hw->cccr_dentry = debugfs_create_file("cccr", 0200,
                                              parent_dir, iwm,
                                              &iwm_debugfs_sdio_fops);
-       result = PTR_ERR(hw->cccr_dentry);
-       if (IS_ERR(hw->cccr_dentry) && (result != -ENODEV)) {
-               IWM_ERR(iwm, "Couldn't create CCCR entry: %d\n", result);
-               return result;
-       }
-
-       return 0;
 }
 
 static void if_sdio_debugfs_exit(struct iwm_priv *iwm)
@@ -440,11 +432,7 @@ static int iwm_sdio_probe(struct sdio_func *func,
        hw = iwm_private(iwm);
        hw->iwm = iwm;
 
-       ret = iwm_debugfs_init(iwm);
-       if (ret < 0) {
-               IWM_ERR(iwm, "Debugfs registration failed\n");
-               goto if_free;
-       }
+       iwm_debugfs_init(iwm);
 
        sdio_set_drvdata(func, hw);
 
@@ -473,7 +461,6 @@ static int iwm_sdio_probe(struct sdio_func *func,
        destroy_workqueue(hw->isr_wq);
  debugfs_exit:
        iwm_debugfs_exit(iwm);
- if_free:
        iwm_if_free(iwm);
        return ret;
 }