aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/misc/mei
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2013-03-27 07:42:15 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-29 11:31:17 -0400
commitcea6aec451586afef2bace28d08145a869131b5b (patch)
tree918be76c25cd789c3a0dccd1cf917a3f3a4b3ddd /drivers/misc/mei
parent8c876be81a1f2f0ab33ffb2b00871e65c7a658b3 (diff)
mei: drop RECOVERING_FROM_RESET device state
ECOVERING_FROM_RESET device state is never set we can remove it Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/mei')
-rw-r--r--drivers/misc/mei/init.c4
-rw-r--r--drivers/misc/mei/mei_dev.h1
2 files changed, 0 insertions, 5 deletions
diff --git a/drivers/misc/mei/init.c b/drivers/misc/mei/init.c
index 1ab1fb1db07b..09a9980303b4 100644
--- a/drivers/misc/mei/init.c
+++ b/drivers/misc/mei/init.c
@@ -34,7 +34,6 @@ const char *mei_dev_state_str(int state)
34 MEI_DEV_STATE(ENABLED); 34 MEI_DEV_STATE(ENABLED);
35 MEI_DEV_STATE(RESETING); 35 MEI_DEV_STATE(RESETING);
36 MEI_DEV_STATE(DISABLED); 36 MEI_DEV_STATE(DISABLED);
37 MEI_DEV_STATE(RECOVERING_FROM_RESET);
38 MEI_DEV_STATE(POWER_DOWN); 37 MEI_DEV_STATE(POWER_DOWN);
39 MEI_DEV_STATE(POWER_UP); 38 MEI_DEV_STATE(POWER_UP);
40 default: 39 default:
@@ -139,9 +138,6 @@ void mei_reset(struct mei_device *dev, int interrupts_enabled)
139{ 138{
140 bool unexpected; 139 bool unexpected;
141 140
142 if (dev->dev_state == MEI_DEV_RECOVERING_FROM_RESET)
143 return;
144
145 unexpected = (dev->dev_state != MEI_DEV_INITIALIZING && 141 unexpected = (dev->dev_state != MEI_DEV_INITIALIZING &&
146 dev->dev_state != MEI_DEV_DISABLED && 142 dev->dev_state != MEI_DEV_DISABLED &&
147 dev->dev_state != MEI_DEV_POWER_DOWN && 143 dev->dev_state != MEI_DEV_POWER_DOWN &&
diff --git a/drivers/misc/mei/mei_dev.h b/drivers/misc/mei/mei_dev.h
index d6fd3d6410d6..091f50af18a4 100644
--- a/drivers/misc/mei/mei_dev.h
+++ b/drivers/misc/mei/mei_dev.h
@@ -97,7 +97,6 @@ enum mei_dev_state {
97 MEI_DEV_ENABLED, 97 MEI_DEV_ENABLED,
98 MEI_DEV_RESETING, 98 MEI_DEV_RESETING,
99 MEI_DEV_DISABLED, 99 MEI_DEV_DISABLED,
100 MEI_DEV_RECOVERING_FROM_RESET,
101 MEI_DEV_POWER_DOWN, 100 MEI_DEV_POWER_DOWN,
102 MEI_DEV_POWER_UP 101 MEI_DEV_POWER_UP
103}; 102};