From cea6aec451586afef2bace28d08145a869131b5b Mon Sep 17 00:00:00 2001 From: Tomas Winkler Date: Wed, 27 Mar 2013 13:42:15 +0200 Subject: mei: drop RECOVERING_FROM_RESET device state ECOVERING_FROM_RESET device state is never set we can remove it Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman --- drivers/misc/mei/init.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'drivers/misc/mei/init.c') 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 && -- cgit v1.2.3