diff options
author | Tomas Winkler <tomas.winkler@intel.com> | 2014-02-12 14:41:52 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-14 14:12:46 -0500 |
commit | 6bb948c9e500d24321c36c67c81daf8d1a7e561e (patch) | |
tree | bd45c66165b1e42c0eed0cc64b15aa75345d9a34 /drivers/misc/mei/mei_dev.h | |
parent | 02a7eecc6ee565f5f3af836d56fe25bafcc49c98 (diff) |
mei: get rid of ext_msg
Use more standard message writing for
oob data.
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/mei/mei_dev.h')
-rw-r--r-- | drivers/misc/mei/mei_dev.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/misc/mei/mei_dev.h b/drivers/misc/mei/mei_dev.h index f2c949ef3f28..21e52496bc6e 100644 --- a/drivers/misc/mei/mei_dev.h +++ b/drivers/misc/mei/mei_dev.h | |||
@@ -133,6 +133,7 @@ enum mei_wd_states { | |||
133 | * @MEI_FOP_READ - read | 133 | * @MEI_FOP_READ - read |
134 | * @MEI_FOP_WRITE - write | 134 | * @MEI_FOP_WRITE - write |
135 | * @MEI_FOP_CONNECT - connect | 135 | * @MEI_FOP_CONNECT - connect |
136 | * @MEI_FOP_DISCONNECT_RSP - disconnect response | ||
136 | * @MEI_FOP_OPEN - open | 137 | * @MEI_FOP_OPEN - open |
137 | * @MEI_FOP_CLOSE - close | 138 | * @MEI_FOP_CLOSE - close |
138 | */ | 139 | */ |
@@ -140,6 +141,7 @@ enum mei_cb_file_ops { | |||
140 | MEI_FOP_READ = 0, | 141 | MEI_FOP_READ = 0, |
141 | MEI_FOP_WRITE, | 142 | MEI_FOP_WRITE, |
142 | MEI_FOP_CONNECT, | 143 | MEI_FOP_CONNECT, |
144 | MEI_FOP_DISCONNECT_RSP, | ||
143 | MEI_FOP_OPEN, | 145 | MEI_FOP_OPEN, |
144 | MEI_FOP_CLOSE | 146 | MEI_FOP_CLOSE |
145 | }; | 147 | }; |
@@ -339,7 +341,6 @@ struct mei_cl_device { | |||
339 | * @hbuf_depth - depth of hardware host/write buffer is slots | 341 | * @hbuf_depth - depth of hardware host/write buffer is slots |
340 | * @hbuf_is_ready - query if the host host/write buffer is ready | 342 | * @hbuf_is_ready - query if the host host/write buffer is ready |
341 | * @wr_msg - the buffer for hbm control messages | 343 | * @wr_msg - the buffer for hbm control messages |
342 | * @wr_ext_msg - the buffer for hbm control responses (set in read cycle) | ||
343 | */ | 344 | */ |
344 | struct mei_device { | 345 | struct mei_device { |
345 | struct pci_dev *pdev; /* pointer to pci device struct */ | 346 | struct pci_dev *pdev; /* pointer to pci device struct */ |
@@ -394,11 +395,6 @@ struct mei_device { | |||
394 | unsigned char data[128]; | 395 | unsigned char data[128]; |
395 | } wr_msg; | 396 | } wr_msg; |
396 | 397 | ||
397 | struct { | ||
398 | struct mei_msg_hdr hdr; | ||
399 | unsigned char data[4]; /* All HBM messages are 4 bytes */ | ||
400 | } wr_ext_msg; /* for control responses */ | ||
401 | |||
402 | struct hbm_version version; | 398 | struct hbm_version version; |
403 | 399 | ||
404 | struct mei_me_client *me_clients; /* Note: memory has to be allocated */ | 400 | struct mei_me_client *me_clients; /* Note: memory has to be allocated */ |