From 5542bd91aa9189bcdc09565a1490c489da6304e8 Mon Sep 17 00:00:00 2001 From: Wei Yongjun Date: Tue, 9 Apr 2013 14:30:19 +0800 Subject: [PATCH] --- yaml --- r: 363210 b: refs/heads/master c: a42f82f57a6411c89538a8c0a44150f67e449a4a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/misc/mei/debugfs.c | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 95421b9a2b3f..c12eff154435 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 36eda94fcf936ccee5a8693af7738174a56be898 +refs/heads/master: a42f82f57a6411c89538a8c0a44150f67e449a4a diff --git a/trunk/drivers/misc/mei/debugfs.c b/trunk/drivers/misc/mei/debugfs.c index 7135a7186940..e3870f22d238 100644 --- a/trunk/drivers/misc/mei/debugfs.c +++ b/trunk/drivers/misc/mei/debugfs.c @@ -24,12 +24,6 @@ #include "mei_dev.h" #include "hw.h" -static int mei_dbgfs_open(struct inode *inode, struct file *file) -{ - file->private_data = inode->i_private; - return 0; -} - static ssize_t mei_dbgfs_read_meclients(struct file *fp, char __user *ubuf, size_t cnt, loff_t *ppos) { @@ -76,7 +70,7 @@ static ssize_t mei_dbgfs_read_meclients(struct file *fp, char __user *ubuf, } static const struct file_operations mei_dbgfs_fops_meclients = { - .open = mei_dbgfs_open, + .open = simple_open, .read = mei_dbgfs_read_meclients, .llseek = generic_file_llseek, }; @@ -100,7 +94,7 @@ static ssize_t mei_dbgfs_read_devstate(struct file *fp, char __user *ubuf, return ret; } static const struct file_operations mei_dbgfs_fops_devstate = { - .open = mei_dbgfs_open, + .open = simple_open, .read = mei_dbgfs_read_devstate, .llseek = generic_file_llseek, };