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

[karo-tx-linux.git] / drivers / net / wireless / ath / ath9k / debug.c

diff --git a/drivers/net/wireless/ath/ath9k/debug.c b/drivers/net/wireless/ath/ath9k/debug.c
index 244723a3ed4108c5a70fbf534880cebe92bc94d3..04edce941cb7a19cf53c837de2eee62980d85fc6 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/debug.c
+++ b/drivers/net/wireless/ath/ath9k/debug.c
@@ -26,11 +26,6 @@
 #define REG_READ_D(_ah, _reg) \
        ath9k_hw_common(_ah)->ops->read((_ah), (_reg))
 
-static int ath9k_debugfs_open(struct inode *inode, struct file *file)
-{
-       file->private_data = inode->i_private;
-       return 0;
-}
 
 static ssize_t ath9k_debugfs_read_buf(struct file *file, char __user *user_buf,
                                      size_t count, loff_t *ppos)
@@ -83,7 +78,7 @@ static ssize_t write_file_debug(struct file *file, const char __user *user_buf,
 static const struct file_operations fops_debug = {
        .read = read_file_debug,
        .write = write_file_debug,
-       .open = ath9k_debugfs_open,
+       .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = default_llseek,
 };
@@ -129,7 +124,7 @@ static ssize_t write_file_tx_chainmask(struct file *file, const char __user *use
 static const struct file_operations fops_tx_chainmask = {
        .read = read_file_tx_chainmask,
        .write = write_file_tx_chainmask,
-       .open = ath9k_debugfs_open,
+       .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = default_llseek,
 };
@@ -172,7 +167,7 @@ static ssize_t write_file_rx_chainmask(struct file *file, const char __user *use
 static const struct file_operations fops_rx_chainmask = {
        .read = read_file_rx_chainmask,
        .write = write_file_rx_chainmask,
-       .open = ath9k_debugfs_open,
+       .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = default_llseek,
 };
@@ -223,7 +218,7 @@ static ssize_t write_file_disable_ani(struct file *file,
 static const struct file_operations fops_disable_ani = {
        .read = read_file_disable_ani,
        .write = write_file_disable_ani,
-       .open = ath9k_debugfs_open,
+       .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = default_llseek,
 };
@@ -324,7 +319,7 @@ static ssize_t read_file_dma(struct file *file, char __user *user_buf,
 
 static const struct file_operations fops_dma = {
        .read = read_file_dma,
-       .open = ath9k_debugfs_open,
+       .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = default_llseek,
 };
@@ -446,7 +441,7 @@ static ssize_t read_file_interrupt(struct file *file, char __user *user_buf,
 
 static const struct file_operations fops_interrupt = {
        .read = read_file_interrupt,
-       .open = ath9k_debugfs_open,
+       .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = default_llseek,
 };
@@ -853,28 +848,28 @@ void ath_debug_stat_tx(struct ath_softc *sc, struct ath_buf *bf,
 
 static const struct file_operations fops_xmit = {
        .read = read_file_xmit,
-       .open = ath9k_debugfs_open,
+       .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = default_llseek,
 };
 
 static const struct file_operations fops_stations = {
        .read = read_file_stations,
-       .open = ath9k_debugfs_open,
+       .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = default_llseek,
 };
 
 static const struct file_operations fops_misc = {
        .read = read_file_misc,
-       .open = ath9k_debugfs_open,
+       .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = default_llseek,
 };
 
 static const struct file_operations fops_reset = {
        .read = read_file_reset,
-       .open = ath9k_debugfs_open,
+       .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = default_llseek,
 };
@@ -1036,7 +1031,7 @@ void ath_debug_stat_rx(struct ath_softc *sc, struct ath_rx_status *rs)
 
 static const struct file_operations fops_recv = {
        .read = read_file_recv,
-       .open = ath9k_debugfs_open,
+       .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = default_llseek,
 };
@@ -1075,7 +1070,7 @@ static ssize_t write_file_regidx(struct file *file, const char __user *user_buf,
 static const struct file_operations fops_regidx = {
        .read = read_file_regidx,
        .write = write_file_regidx,
-       .open = ath9k_debugfs_open,
+       .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = default_llseek,
 };
@@ -1122,7 +1117,7 @@ static ssize_t write_file_regval(struct file *file, const char __user *user_buf,
 static const struct file_operations fops_regval = {
        .read = read_file_regval,
        .write = write_file_regval,
-       .open = ath9k_debugfs_open,
+       .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = default_llseek,
 };
@@ -1211,7 +1206,7 @@ static ssize_t read_file_dump_nfcal(struct file *file, char __user *user_buf,
 
 static const struct file_operations fops_dump_nfcal = {
        .read = read_file_dump_nfcal,
-       .open = ath9k_debugfs_open,
+       .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = default_llseek,
 };
@@ -1239,7 +1234,7 @@ static ssize_t read_file_base_eeprom(struct file *file, char __user *user_buf,
 
 static const struct file_operations fops_base_eeprom = {
        .read = read_file_base_eeprom,
-       .open = ath9k_debugfs_open,
+       .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = default_llseek,
 };
@@ -1267,7 +1262,7 @@ static ssize_t read_file_modal_eeprom(struct file *file, char __user *user_buf,
 
 static const struct file_operations fops_modal_eeprom = {
        .read = read_file_modal_eeprom,
-       .open = ath9k_debugfs_open,
+       .open = simple_open,
        .owner = THIS_MODULE,
        .llseek = default_llseek,
 };