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>

diff --git a/drivers/misc/mei/init.c b/drivers/misc/mei/init.c
index 1ab1fb1db07ba5d7e69238e2ad092d823754514f..09a9980303b4a73206b30990a2947a70af98cafe 100644 (file)
--- 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 d6fd3d6410d6398d2823d7ffe8b2321b850efc3a..091f50af18a4a05888974e006cdb12f5935dfc20 100644 (file)
--- 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
 };