diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-04-12 21:49:28 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-04-12 21:49:28 +0400 |
| commit | 8065248069097dddf9945acfb2081025e9618c16 (patch) | |
| tree | eddf3fb0372ba0f65c01382d386942ea8d18932d /drivers/acpi/ec_sys.c | |
| parent | e66a8ddff72e85605f2212a0ebc666c7e9116641 (diff) | |
| parent | b4838d12e1f3cb48c2489a0b08733b5dbf848297 (diff) | |
| download | linux-8065248069097dddf9945acfb2081025e9618c16.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'drivers/acpi/ec_sys.c')
| -rw-r--r-- | drivers/acpi/ec_sys.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/acpi/ec_sys.c b/drivers/acpi/ec_sys.c index b258cab9061c..7586544fddb4 100644 --- a/drivers/acpi/ec_sys.c +++ b/drivers/acpi/ec_sys.c @@ -27,12 +27,6 @@ MODULE_PARM_DESC(write_support, "Dangerous, reboot and removal of battery may " static struct dentry *acpi_ec_debugfs_dir; -static int acpi_ec_open_io(struct inode *i, struct file *f) -{ - f->private_data = i->i_private; - return 0; -} - static ssize_t acpi_ec_read_io(struct file *f, char __user *buf, size_t count, loff_t *off) { @@ -95,7 +89,7 @@ static ssize_t acpi_ec_write_io(struct file *f, const char __user *buf, static const struct file_operations acpi_ec_io_ops = { .owner = THIS_MODULE, - .open = acpi_ec_open_io, + .open = simple_open, .read = acpi_ec_read_io, .write = acpi_ec_write_io, .llseek = default_llseek, |