* [char-misc-next 2/2 V2] mei: drop RECOVERING_FROM_RESET device state
@ 2013-03-27 11:42 Tomas Winkler
0 siblings, 0 replies; only message in thread
From: Tomas Winkler @ 2013-03-27 11:42 UTC (permalink / raw)
To: gregkh; +Cc: arnd, linux-kernel, Tomas Winkler
ECOVERING_FROM_RESET device state is never set
we can remove it
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
---
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(-)
diff --git a/drivers/misc/mei/init.c b/drivers/misc/mei/init.c
index 1ab1fb1..09a9980 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 d6fd3d6..091f50af 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
};
--
1.7.11.7
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2013-03-27 11:42 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-03-27 11:42 [char-misc-next 2/2 V2] mei: drop RECOVERING_FROM_RESET device state Tomas Winkler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).