aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/misc/mei/mei_dev.h
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2012-08-06 17:03:56 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-08-16 12:43:58 -0400
commitb210d7506f416e7250eb52c314e5ed08928639dd (patch)
treebc5232d3b3b197305a817a65302ba6bad529a322 /drivers/misc/mei/mei_dev.h
parent6ddf3aea42ba20eadc8ff362926c947ac43c9401 (diff)
mei: name space for mei device state
1. add MEI_DEV_ prefix for mei device state enums 2. rename mei_state to dev_state 3. add constant to string translation for debug 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/mei_dev.h')
-rw-r--r--drivers/misc/mei/mei_dev.h22
1 files changed, 12 insertions, 10 deletions
diff --git a/drivers/misc/mei/mei_dev.h b/drivers/misc/mei/mei_dev.h
index 1ff1fc678fb3..35d0538a5974 100644
--- a/drivers/misc/mei/mei_dev.h
+++ b/drivers/misc/mei/mei_dev.h
@@ -78,17 +78,19 @@ enum file_state {
78}; 78};
79 79
80/* MEI device states */ 80/* MEI device states */
81enum mei_states { 81enum mei_dev_state {
82 MEI_INITIALIZING = 0, 82 MEI_DEV_INITIALIZING = 0,
83 MEI_INIT_CLIENTS, 83 MEI_DEV_INIT_CLIENTS,
84 MEI_ENABLED, 84 MEI_DEV_ENABLED,
85 MEI_RESETING, 85 MEI_DEV_RESETING,
86 MEI_DISABLED, 86 MEI_DEV_DISABLED,
87 MEI_RECOVERING_FROM_RESET, 87 MEI_DEV_RECOVERING_FROM_RESET,
88 MEI_POWER_DOWN, 88 MEI_DEV_POWER_DOWN,
89 MEI_POWER_UP 89 MEI_DEV_POWER_UP
90}; 90};
91 91
92const char *mei_dev_state_str(int state);
93
92/* init clients states*/ 94/* init clients states*/
93enum mei_init_clients_states { 95enum mei_init_clients_states {
94 MEI_START_MESSAGE = 0, 96 MEI_START_MESSAGE = 0,
@@ -218,7 +220,7 @@ struct mei_device {
218 /* 220 /*
219 * mei device states 221 * mei device states
220 */ 222 */
221 enum mei_states mei_state; 223 enum mei_dev_state dev_state;
222 enum mei_init_clients_states init_clients_state; 224 enum mei_init_clients_states init_clients_state;
223 u16 init_clients_timer; 225 u16 init_clients_timer;
224 bool stop; 226 bool stop;