mei: deprecate the mei_wd_state_independence_msg
wd independence is deprecated, remove it. Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:

committed by
Greg Kroah-Hartman

parent
f35c69b736
commit
7131799b14
@@ -194,7 +194,6 @@ static ssize_t mei_read(struct file *file, char __user *ubuf,
|
||||
struct mei_cl_cb *cb_pos = NULL;
|
||||
struct mei_cl_cb *cb = NULL;
|
||||
struct mei_device *dev;
|
||||
int i;
|
||||
int rets;
|
||||
int err;
|
||||
|
||||
@@ -210,20 +209,6 @@ static ssize_t mei_read(struct file *file, char __user *ubuf,
|
||||
goto out;
|
||||
}
|
||||
|
||||
if ((cl->sm_state & MEI_WD_STATE_INDEPENDENCE_MSG_SENT) == 0) {
|
||||
/* Do not allow to read watchdog client */
|
||||
i = mei_me_cl_by_uuid(dev, &mei_wd_guid);
|
||||
if (i >= 0) {
|
||||
struct mei_me_client *me_client = &dev->me_clients[i];
|
||||
if (cl->me_client_id == me_client->client_id) {
|
||||
rets = -EBADF;
|
||||
goto out;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
cl->sm_state &= ~MEI_WD_STATE_INDEPENDENCE_MSG_SENT;
|
||||
}
|
||||
|
||||
if (cl == &dev->iamthif_cl) {
|
||||
rets = mei_amthif_read(dev, file, ubuf, length, offset);
|
||||
goto out;
|
||||
@@ -420,16 +405,6 @@ static ssize_t mei_write(struct file *file, const char __user *ubuf,
|
||||
if (rets)
|
||||
goto out;
|
||||
|
||||
cl->sm_state = 0;
|
||||
if (length == 4 &&
|
||||
((memcmp(mei_wd_state_independence_msg[0],
|
||||
write_cb->request_buffer.data, 4) == 0) ||
|
||||
(memcmp(mei_wd_state_independence_msg[1],
|
||||
write_cb->request_buffer.data, 4) == 0) ||
|
||||
(memcmp(mei_wd_state_independence_msg[2],
|
||||
write_cb->request_buffer.data, 4) == 0)))
|
||||
cl->sm_state |= MEI_WD_STATE_INDEPENDENCE_MSG_SENT;
|
||||
|
||||
if (cl == &dev->iamthif_cl) {
|
||||
rets = mei_amthif_write(dev, write_cb);
|
||||
|
||||
|
Reference in New Issue
Block a user