Merge branch 'late/fixes' into fixes

[deliverable/linux.git] / drivers / net / wireless / iwlegacy / debug.c

diff --git a/drivers/net/wireless/iwlegacy/debug.c b/drivers/net/wireless/iwlegacy/debug.c
index 229849150aac0bb20e152b6a79b0658ebf3b18bb..eff26501d60a63407fba5b8cff66778d612df54e 100644 (file)
--- a/drivers/net/wireless/iwlegacy/debug.c
+++ b/drivers/net/wireless/iwlegacy/debug.c
@@ -160,18 +160,12 @@ static ssize_t il_dbgfs_##name##_write(struct file *file,              \
                                        const char __user *user_buf,    \
                                        size_t count, loff_t *ppos);
 
-static int
-il_dbgfs_open_file_generic(struct inode *inode, struct file *file)
-{
-       file->private_data = inode->i_private;
-       return 0;
-}
 
 #define DEBUGFS_READ_FILE_OPS(name)                            \
        DEBUGFS_READ_FUNC(name);                                \
 static const struct file_operations il_dbgfs_##name##_ops = {  \
        .read = il_dbgfs_##name##_read,                         \
-       .open = il_dbgfs_open_file_generic,                     \
+       .open = simple_open,                                    \
        .llseek = generic_file_llseek,                          \
 };
 
@@ -179,7 +173,7 @@ static const struct file_operations il_dbgfs_##name##_ops = {       \
        DEBUGFS_WRITE_FUNC(name);                               \
 static const struct file_operations il_dbgfs_##name##_ops = {  \
        .write = il_dbgfs_##name##_write,                       \
-       .open = il_dbgfs_open_file_generic,                     \
+       .open = simple_open,                                    \
        .llseek = generic_file_llseek,                          \
 };
 
@@ -189,7 +183,7 @@ static const struct file_operations il_dbgfs_##name##_ops = {       \
 static const struct file_operations il_dbgfs_##name##_ops = {  \
        .write = il_dbgfs_##name##_write,                       \
        .read = il_dbgfs_##name##_read,                         \
-       .open = il_dbgfs_open_file_generic,                     \
+       .open = simple_open,                                    \
        .llseek = generic_file_llseek,                          \
 };