diff options
author | Tomas Winkler <tomas.winkler@intel.com> | 2012-06-19 02:13:37 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-20 19:41:38 -0400 |
commit | 21c66d1be7c586b56c2902ada4ba030a12b00063 (patch) | |
tree | cdd393c1330fd325eab58b75355d73f1b8990d8b /drivers/misc | |
parent | 7d5e0e59542ac452585e3a33abcad6e26b4dec4a (diff) |
mei: group wd_interface_reg with watchdog variables within struct mei_device
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc')
-rw-r--r-- | drivers/misc/mei/mei_dev.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/misc/mei/mei_dev.h b/drivers/misc/mei/mei_dev.h index 63d7ee97c5f..4fe653392a4 100644 --- a/drivers/misc/mei/mei_dev.h +++ b/drivers/misc/mei/mei_dev.h | |||
@@ -237,6 +237,7 @@ struct mei_device { | |||
237 | bool mei_host_buffer_is_empty; | 237 | bool mei_host_buffer_is_empty; |
238 | 238 | ||
239 | struct mei_cl wd_cl; | 239 | struct mei_cl wd_cl; |
240 | bool wd_interface_reg; | ||
240 | bool wd_pending; | 241 | bool wd_pending; |
241 | bool wd_stopped; | 242 | bool wd_stopped; |
242 | bool wd_bypass; /* if false, don't refresh watchdog ME client */ | 243 | bool wd_bypass; /* if false, don't refresh watchdog ME client */ |
@@ -245,7 +246,6 @@ struct mei_device { | |||
245 | unsigned char wd_data[MEI_START_WD_DATA_SIZE]; | 246 | unsigned char wd_data[MEI_START_WD_DATA_SIZE]; |
246 | 247 | ||
247 | 248 | ||
248 | |||
249 | struct file *iamthif_file_object; | 249 | struct file *iamthif_file_object; |
250 | struct mei_cl iamthif_cl; | 250 | struct mei_cl iamthif_cl; |
251 | struct mei_cl_cb *iamthif_current_cb; | 251 | struct mei_cl_cb *iamthif_current_cb; |
@@ -259,8 +259,6 @@ struct mei_device { | |||
259 | bool iamthif_flow_control_pending; | 259 | bool iamthif_flow_control_pending; |
260 | bool iamthif_ioctl; | 260 | bool iamthif_ioctl; |
261 | bool iamthif_canceled; | 261 | bool iamthif_canceled; |
262 | |||
263 | bool wd_interface_reg; | ||
264 | }; | 262 | }; |
265 | 263 | ||
266 | 264 | ||