diff options
author | Tomas Winkler <tomas.winkler@intel.com> | 2012-11-11 10:37:58 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-15 18:34:18 -0500 |
commit | e773efc405026bb8540c84bf45420bd66d5b34a7 (patch) | |
tree | 97d02615bbcd3622bcc80f26bfb05bef4a474615 /drivers/misc/mei/mei_dev.h | |
parent | ab5c4a56d46f6a41d238aa6546f900407c9be275 (diff) |
mei: amthif: prefix cb list with amthif
amthif cb list were prefixed with amthi_ instead
if amthif.
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 | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/misc/mei/mei_dev.h b/drivers/misc/mei/mei_dev.h index 8b96d99b8577..ce246b0fb2d6 100644 --- a/drivers/misc/mei/mei_dev.h +++ b/drivers/misc/mei/mei_dev.h | |||
@@ -184,16 +184,13 @@ struct mei_device { | |||
184 | /* | 184 | /* |
185 | * lists of queues | 185 | * lists of queues |
186 | */ | 186 | */ |
187 | /* array of pointers to aio lists */ | 187 | /* array of pointers to aio lists */ |
188 | struct mei_cl_cb read_list; /* driver read queue */ | 188 | struct mei_cl_cb read_list; /* driver read queue */ |
189 | struct mei_cl_cb write_list; /* driver write queue */ | 189 | struct mei_cl_cb write_list; /* driver write queue */ |
190 | struct mei_cl_cb write_waiting_list; /* write waiting queue */ | 190 | struct mei_cl_cb write_waiting_list; /* write waiting queue */ |
191 | struct mei_cl_cb ctrl_wr_list; /* managed write IOCTL list */ | 191 | struct mei_cl_cb ctrl_wr_list; /* managed write IOCTL list */ |
192 | struct mei_cl_cb ctrl_rd_list; /* managed read IOCTL list */ | 192 | struct mei_cl_cb ctrl_rd_list; /* managed read IOCTL list */ |
193 | struct mei_cl_cb amthi_cmd_list; /* amthi list for cmd waiting */ | ||
194 | 193 | ||
195 | /* driver managed amthi list for reading completed amthi cmd data */ | ||
196 | struct mei_cl_cb amthi_read_complete_list; | ||
197 | /* | 194 | /* |
198 | * list of files | 195 | * list of files |
199 | */ | 196 | */ |
@@ -254,6 +251,10 @@ struct mei_device { | |||
254 | unsigned char wd_data[MEI_WD_START_MSG_SIZE]; | 251 | unsigned char wd_data[MEI_WD_START_MSG_SIZE]; |
255 | 252 | ||
256 | 253 | ||
254 | /* amthif list for cmd waiting */ | ||
255 | struct mei_cl_cb amthif_cmd_list; | ||
256 | /* driver managed amthif list for reading completed amthif cmd data */ | ||
257 | struct mei_cl_cb amthif_rd_complete_list; | ||
257 | struct file *iamthif_file_object; | 258 | struct file *iamthif_file_object; |
258 | struct mei_cl iamthif_cl; | 259 | struct mei_cl iamthif_cl; |
259 | struct mei_cl_cb *iamthif_current_cb; | 260 | struct mei_cl_cb *iamthif_current_cb; |