Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
This commit is contained in:
@@ -74,13 +74,6 @@ static unsigned int ath5k_debug;
|
||||
module_param_named(debug, ath5k_debug, uint, 0);
|
||||
|
||||
|
||||
static int ath5k_debugfs_open(struct inode *inode, struct file *file)
|
||||
{
|
||||
file->private_data = inode->i_private;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
/* debugfs: registers */
|
||||
|
||||
struct reg {
|
||||
@@ -268,7 +261,7 @@ static ssize_t write_file_beacon(struct file *file,
|
||||
static const struct file_operations fops_beacon = {
|
||||
.read = read_file_beacon,
|
||||
.write = write_file_beacon,
|
||||
.open = ath5k_debugfs_open,
|
||||
.open = simple_open,
|
||||
.owner = THIS_MODULE,
|
||||
.llseek = default_llseek,
|
||||
};
|
||||
@@ -288,7 +281,7 @@ static ssize_t write_file_reset(struct file *file,
|
||||
|
||||
static const struct file_operations fops_reset = {
|
||||
.write = write_file_reset,
|
||||
.open = ath5k_debugfs_open,
|
||||
.open = simple_open,
|
||||
.owner = THIS_MODULE,
|
||||
.llseek = noop_llseek,
|
||||
};
|
||||
@@ -368,7 +361,7 @@ static ssize_t write_file_debug(struct file *file,
|
||||
static const struct file_operations fops_debug = {
|
||||
.read = read_file_debug,
|
||||
.write = write_file_debug,
|
||||
.open = ath5k_debugfs_open,
|
||||
.open = simple_open,
|
||||
.owner = THIS_MODULE,
|
||||
.llseek = default_llseek,
|
||||
};
|
||||
@@ -480,7 +473,7 @@ static ssize_t write_file_antenna(struct file *file,
|
||||
static const struct file_operations fops_antenna = {
|
||||
.read = read_file_antenna,
|
||||
.write = write_file_antenna,
|
||||
.open = ath5k_debugfs_open,
|
||||
.open = simple_open,
|
||||
.owner = THIS_MODULE,
|
||||
.llseek = default_llseek,
|
||||
};
|
||||
@@ -535,7 +528,7 @@ static ssize_t read_file_misc(struct file *file, char __user *user_buf,
|
||||
|
||||
static const struct file_operations fops_misc = {
|
||||
.read = read_file_misc,
|
||||
.open = ath5k_debugfs_open,
|
||||
.open = simple_open,
|
||||
.owner = THIS_MODULE,
|
||||
};
|
||||
|
||||
@@ -650,7 +643,7 @@ static ssize_t write_file_frameerrors(struct file *file,
|
||||
static const struct file_operations fops_frameerrors = {
|
||||
.read = read_file_frameerrors,
|
||||
.write = write_file_frameerrors,
|
||||
.open = ath5k_debugfs_open,
|
||||
.open = simple_open,
|
||||
.owner = THIS_MODULE,
|
||||
.llseek = default_llseek,
|
||||
};
|
||||
@@ -813,7 +806,7 @@ static ssize_t write_file_ani(struct file *file,
|
||||
static const struct file_operations fops_ani = {
|
||||
.read = read_file_ani,
|
||||
.write = write_file_ani,
|
||||
.open = ath5k_debugfs_open,
|
||||
.open = simple_open,
|
||||
.owner = THIS_MODULE,
|
||||
.llseek = default_llseek,
|
||||
};
|
||||
@@ -884,7 +877,7 @@ static ssize_t write_file_queue(struct file *file,
|
||||
static const struct file_operations fops_queue = {
|
||||
.read = read_file_queue,
|
||||
.write = write_file_queue,
|
||||
.open = ath5k_debugfs_open,
|
||||
.open = simple_open,
|
||||
.owner = THIS_MODULE,
|
||||
.llseek = default_llseek,
|
||||
};
|
||||
|
Reference in New Issue
Block a user