diff options
author | Alexander Usyskin <alexander.usyskin@intel.com> | 2016-07-26 00:06:07 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-08-30 14:39:42 +0200 |
commit | 9d27e73c1897c17e535987a4758fddb7a2fe1fd3 (patch) | |
tree | 249b7091ab720734fe751bef38a390242672e589 /drivers/misc/mei/main.c | |
parent | mei: enqueue consecutive reads (diff) | |
download | linux-9d27e73c1897c17e535987a4758fddb7a2fe1fd3.tar.xz linux-9d27e73c1897c17e535987a4758fddb7a2fe1fd3.zip |
mei: amthif: drop mei_amthif_read
mei_amthif_read have only one difference from mei_read, it is not
calling mei_read_start().
Make mei_read_start return immediately for amthif client and drop the
special mei_amthif_read function.
Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/mei/main.c')
-rw-r--r-- | drivers/misc/mei/main.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/misc/mei/main.c b/drivers/misc/mei/main.c index 650061b6ab9b..fa50635512e8 100644 --- a/drivers/misc/mei/main.c +++ b/drivers/misc/mei/main.c @@ -164,11 +164,6 @@ static ssize_t mei_read(struct file *file, char __user *ubuf, goto out; } - if (cl == &dev->iamthif_cl) { - rets = mei_amthif_read(dev, file, ubuf, length, offset); - goto out; - } - cb = mei_cl_read_cb(cl, file); if (cb) goto copy_buffer; |