a7y18lte-ubports/android_kernel_samsung_universal7885
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mei: drop RECOVERING_FROM_RESET device state

Browse Source 
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>
This commit is contained in:
Tomas Winkler 2013-03-27 13:42:15 +02:00 committed by Greg Kroah-Hartman
parent 8c876be81a
commit cea6aec451
2 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/misc/mei/init.c
View File

@ -34,7 +34,6 @@ const char *mei_dev_state_str(int state)
MEI_DEV_STATE(ENABLED); MEI_DEV_STATE(ENABLED);
MEI_DEV_STATE(RESETING); MEI_DEV_STATE(RESETING);
MEI_DEV_STATE(DISABLED); MEI_DEV_STATE(DISABLED);
MEI_DEV_STATE(RECOVERING_FROM_RESET);
MEI_DEV_STATE(POWER_DOWN); MEI_DEV_STATE(POWER_DOWN);
MEI_DEV_STATE(POWER_UP); MEI_DEV_STATE(POWER_UP);
default: default:
@ -139,9 +138,6 @@ void mei_reset(struct mei_device *dev, int interrupts_enabled)
{ {
bool unexpected; bool unexpected;
if (dev->dev_state == MEI_DEV_RECOVERING_FROM_RESET)
return;
unexpected = (dev->dev_state != MEI_DEV_INITIALIZING && unexpected = (dev->dev_state != MEI_DEV_INITIALIZING &&
dev->dev_state != MEI_DEV_DISABLED && dev->dev_state != MEI_DEV_DISABLED &&
dev->dev_state != MEI_DEV_POWER_DOWN && dev->dev_state != MEI_DEV_POWER_DOWN &&

1
drivers/misc/mei/mei_dev.h
View File

@ -97,7 +97,6 @@ enum mei_dev_state {
MEI_DEV_ENABLED, MEI_DEV_ENABLED,
MEI_DEV_RESETING, MEI_DEV_RESETING,
MEI_DEV_DISABLED, MEI_DEV_DISABLED,
MEI_DEV_RECOVERING_FROM_RESET,
MEI_DEV_POWER_DOWN, MEI_DEV_POWER_DOWN,
MEI_DEV_POWER_UP MEI_DEV_POWER_UP
}; };