Commit cea6aec4 authored by Tomas Winkler's avatar Tomas Winkler Committed by Greg Kroah-Hartman
Browse files

mei: drop RECOVERING_FROM_RESET device state 



ECOVERING_FROM_RESET device state is never set
we can remove it

Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8c876be8

drivers/misc/mei/init.c

+0 −4
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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

};