diff options
| author | Tomas Winkler <tomas.winkler@intel.com> | 2013-03-27 13:42:15 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-29 08:31:17 -0700 |
| commit | cea6aec451586afef2bace28d08145a869131b5b (patch) | |
| tree | 918be76c25cd789c3a0dccd1cf917a3f3a4b3ddd /drivers/misc | |
| parent | 8c876be81a1f2f0ab33ffb2b00871e65c7a658b3 (diff) | |
| download | linux-cea6aec451586afef2bace28d08145a869131b5b.tar.bz2 | |
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')
| -rw-r--r-- | drivers/misc/mei/init.c | 4 | ||||
| -rw-r--r-- | drivers/misc/mei/mei_dev.h | 1 |
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) MEI_DEV_STATE(ENABLED); MEI_DEV_STATE(RESETING); MEI_DEV_STATE(DISABLED); - MEI_DEV_STATE(RECOVERING_FROM_RESET); MEI_DEV_STATE(POWER_DOWN); MEI_DEV_STATE(POWER_UP); default: @@ -139,9 +138,6 @@ void mei_reset(struct mei_device *dev, int interrupts_enabled) { bool unexpected; - if (dev->dev_state == MEI_DEV_RECOVERING_FROM_RESET) - return; - unexpected = (dev->dev_state != MEI_DEV_INITIALIZING && dev->dev_state != MEI_DEV_DISABLED && 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 { MEI_DEV_ENABLED, MEI_DEV_RESETING, MEI_DEV_DISABLED, - MEI_DEV_RECOVERING_FROM_RESET, MEI_DEV_POWER_DOWN, MEI_DEV_POWER_UP }; |