From 99f3b998f39f593ffc5ddea5dfb2c438368e4d13 Mon Sep 17 00:00:00 2001 From: Wei Yongjun Date: Mon, 25 Feb 2013 21:24:11 +0800 Subject: [PATCH] --- yaml --- r: 368459 b: refs/heads/master c: ba5295f8b2c789275cc6ffb0a45e50a8aa3a5c84 h: refs/heads/master i: 368457: dce7cf99a280aa7bce758948a1e899934558b6c6 368455: e8224e352a6f6f028909d996d047f0bdabe17732 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/mvm/debugfs.c | 12 +++--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 2b5043bfa5a3..2413975e1c63 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9047e4ad435711e67f57b73b76b1235405118c0e +refs/heads/master: ba5295f8b2c789275cc6ffb0a45e50a8aa3a5c84 diff --git a/trunk/drivers/net/wireless/iwlwifi/mvm/debugfs.c b/trunk/drivers/net/wireless/iwlwifi/mvm/debugfs.c index 9e5313776a26..2ad301164bd9 100644 --- a/trunk/drivers/net/wireless/iwlwifi/mvm/debugfs.c +++ b/trunk/drivers/net/wireless/iwlwifi/mvm/debugfs.c @@ -69,12 +69,6 @@ struct iwl_dbgfs_mvm_ctx { struct ieee80211_vif *vif; }; -static int iwl_dbgfs_open_file_generic(struct inode *inode, struct file *file) -{ - file->private_data = inode->i_private; - return 0; -} - static ssize_t iwl_dbgfs_tx_flush_write(struct file *file, const char __user *user_buf, size_t count, loff_t *ppos) @@ -309,7 +303,7 @@ static ssize_t iwl_dbgfs_power_down_d3_allow_write(struct file *file, #define MVM_DEBUGFS_READ_FILE_OPS(name) \ static const struct file_operations iwl_dbgfs_##name##_ops = { \ .read = iwl_dbgfs_##name##_read, \ - .open = iwl_dbgfs_open_file_generic, \ + .open = simple_open, \ .llseek = generic_file_llseek, \ } @@ -317,14 +311,14 @@ static const struct file_operations iwl_dbgfs_##name##_ops = { \ static const struct file_operations iwl_dbgfs_##name##_ops = { \ .write = iwl_dbgfs_##name##_write, \ .read = iwl_dbgfs_##name##_read, \ - .open = iwl_dbgfs_open_file_generic, \ + .open = simple_open, \ .llseek = generic_file_llseek, \ }; #define MVM_DEBUGFS_WRITE_FILE_OPS(name) \ static const struct file_operations iwl_dbgfs_##name##_ops = { \ .write = iwl_dbgfs_##name##_write, \ - .open = iwl_dbgfs_open_file_generic, \ + .open = simple_open, \ .llseek = generic_file_llseek, \ };