diff options
author | Alexander Usyskin <alexander.usyskin@intel.com> | 2016-05-24 16:03:37 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-08-30 14:35:14 +0200 |
commit | bca7dbacfd4c7f1f069a70e241e39aea5bd85808 (patch) | |
tree | d63ac7c7f667a12c4b70abc0d8adeba73b58441e /drivers/misc/mei/amthif.c | |
parent | 32a1dc1d02eb41196903278f40d6a4aef66ce535 (diff) |
mei: amthif: drop iamthif_current_cb
iamthif_current_cb was used in request cancel in amthif code.
Now a canceled request is discarded only at the end of the processing
and the variable lost its purpose and can be safely removed.
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/amthif.c')
-rw-r--r-- | drivers/misc/mei/amthif.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/misc/mei/amthif.c b/drivers/misc/mei/amthif.c index 0cded8aa72c0..b602fd3b914c 100644 --- a/drivers/misc/mei/amthif.c +++ b/drivers/misc/mei/amthif.c @@ -47,7 +47,6 @@ const uuid_le mei_amthif_guid = UUID_LE(0x12f80028, 0xb4b7, 0x4b2d, void mei_amthif_reset_params(struct mei_device *dev) { /* reset iamthif parameters. */ - dev->iamthif_current_cb = NULL; dev->iamthif_canceled = false; dev->iamthif_state = MEI_IAMTHIF_IDLE; dev->iamthif_stall_timer = 0; @@ -213,7 +212,6 @@ static int mei_amthif_read_start(struct mei_cl *cl, const struct file *file) dev->iamthif_state = MEI_IAMTHIF_READING; dev->iamthif_fp = cb->fp; - dev->iamthif_current_cb = cb; return 0; err: @@ -240,7 +238,6 @@ static int mei_amthif_send_cmd(struct mei_cl *cl, struct mei_cl_cb *cb) dev = cl->dev; dev->iamthif_state = MEI_IAMTHIF_WRITING; - dev->iamthif_current_cb = cb; dev->iamthif_fp = cb->fp; dev->iamthif_canceled = false; @@ -407,7 +404,6 @@ void mei_amthif_complete(struct mei_cl *cl, struct mei_cl_cb *cb) mei_io_cb_free(cb); return; } - dev->iamthif_current_cb = NULL; dev->iamthif_state = MEI_IAMTHIF_IDLE; dev->iamthif_fp = NULL; if (!dev->iamthif_canceled) { @@ -430,7 +426,6 @@ void mei_amthif_complete(struct mei_cl *cl, struct mei_cl_cb *cb) mei_io_cb_free(cb); } - dev->iamthif_current_cb = NULL; dev->iamthif_stall_timer = 0; mei_amthif_run_next_cmd(dev); break; |