aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/misc/mei/interface.c
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2012-11-11 17:38:04 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-15 15:34:19 -0800
commitaeba4a06f28fad11b1e61d150bd3cde3008b80c8 (patch)
treef30ec9285fb6ac3c6d3b52f9f3bf5ad81bec42c0 /drivers/misc/mei/interface.c
parentff8b2f4e424a489222d3c7d55fb2d04c9639ef98 (diff)
downloadkernel_replicant_linux-aeba4a06f28fad11b1e61d150bd3cde3008b80c8.tar.gz
kernel_replicant_linux-aeba4a06f28fad11b1e61d150bd3cde3008b80c8.tar.bz2
kernel_replicant_linux-aeba4a06f28fad11b1e61d150bd3cde3008b80c8.zip
mei: use the same bus msg for connect and disconnect request
structs hbm_client_connect_request and hbm_client_disconnect_request have the same layout so we can drop the later Add kdoc for the request and response structure so it is clear they can be used for both purposes Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/mei/interface.c')
-rw-r--r--drivers/misc/mei/interface.c22
1 files changed, 10 insertions, 12 deletions
diff --git a/drivers/misc/mei/interface.c b/drivers/misc/mei/interface.c
index 509c3957ff45..6b50cf0253e5 100644
--- a/drivers/misc/mei/interface.c
+++ b/drivers/misc/mei/interface.c
@@ -352,26 +352,24 @@ int mei_other_client_is_connecting(struct mei_device *dev,
int mei_disconnect(struct mei_device *dev, struct mei_cl *cl)
{
struct mei_msg_hdr *mei_hdr;
- struct hbm_client_disconnect_request *mei_cli_disconnect;
+ struct hbm_client_connect_request *req;
mei_hdr = (struct mei_msg_hdr *) &dev->wr_msg_buf[0];
mei_hdr->host_addr = 0;
mei_hdr->me_addr = 0;
- mei_hdr->length = sizeof(struct hbm_client_disconnect_request);
+ mei_hdr->length = sizeof(struct hbm_client_connect_request);
mei_hdr->msg_complete = 1;
mei_hdr->reserved = 0;
- mei_cli_disconnect =
- (struct hbm_client_disconnect_request *) &dev->wr_msg_buf[1];
- memset(mei_cli_disconnect, 0, sizeof(*mei_cli_disconnect));
- mei_cli_disconnect->host_addr = cl->host_client_id;
- mei_cli_disconnect->me_addr = cl->me_client_id;
- mei_cli_disconnect->hbm_cmd = CLIENT_DISCONNECT_REQ_CMD;
- mei_cli_disconnect->reserved[0] = 0;
+ req = (struct hbm_client_connect_request *)&dev->wr_msg_buf[1];
+ memset(req, 0, sizeof(*req));
+ req->host_addr = cl->host_client_id;
+ req->me_addr = cl->me_client_id;
+ req->hbm_cmd = CLIENT_DISCONNECT_REQ_CMD;
+ req->reserved = 0;
- return mei_write_message(dev, mei_hdr,
- (unsigned char *) mei_cli_disconnect,
- sizeof(struct hbm_client_disconnect_request));
+ return mei_write_message(dev, mei_hdr, (unsigned char *)req,
+ sizeof(struct hbm_client_connect_request));
}
/**