Skip to contentSkip to conversation

mei: drop RECOVERING_FROM_RESET device state

PATCH New Tomas Winkler 1 participant 1 message Mar 27, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 2/2 mei: drop RECOVERING_FROM_RESET device state

ECOVERING_FROM_RESET device state is never set
we can remove it

---
v2: rebased over char-misc-next: 8c876be81a1f2f0ab33ffb2b00871e65c7a658b3

 drivers/misc/mei/init.c    | 4 ----
 drivers/misc/mei/mei_dev.h | 1 -
 2 files changed, 5 deletions(-)
drivers/misc/mei/init.c +0 -4
index 1ab1fb1..09a9980 100644
@@ -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 &&
drivers/misc/mei/mei_dev.h +0 -1
index d6fd3d6..091f50af 100644
@@ -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
 };
Signature · 1 line
1.7.11.7