Skip to content

Commit

Permalink
mei: remove write only need_reset member of struct mei_device
Browse files Browse the repository at this point in the history
need_reset is not used anymore

Signed-off-by: Tomas Winkler <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
  • Loading branch information
tomasbw authored and gregkh committed Jan 9, 2013
1 parent d025284 commit a9f6b13
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 6 deletions.
6 changes: 1 addition & 5 deletions drivers/misc/mei/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -199,10 +199,8 @@ void mei_reset(struct mei_device *dev, int interrupts_enabled)
struct mei_cl_cb *cb_next = NULL;
bool unexpected;

if (dev->dev_state == MEI_DEV_RECOVERING_FROM_RESET) {
dev->need_reset = true;
if (dev->dev_state == MEI_DEV_RECOVERING_FROM_RESET)
return;
}

unexpected = (dev->dev_state != MEI_DEV_INITIALIZING &&
dev->dev_state != MEI_DEV_DISABLED &&
Expand All @@ -224,8 +222,6 @@ void mei_reset(struct mei_device *dev, int interrupts_enabled)
dev_dbg(&dev->pdev->dev, "currently saved host_hw_state = 0x%08x.\n",
dev->host_hw_state);

dev->need_reset = false;

if (dev->dev_state != MEI_DEV_INITIALIZING) {
if (dev->dev_state != MEI_DEV_DISABLED &&
dev->dev_state != MEI_DEV_POWER_DOWN)
Expand Down
1 change: 0 additions & 1 deletion drivers/misc/mei/mei_dev.h
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,6 @@ struct mei_device {
enum mei_dev_state dev_state;
enum mei_init_clients_states init_clients_state;
u16 init_clients_timer;
bool need_reset;

unsigned char rd_msg_buf[MEI_RD_MSG_BUF_SIZE]; /* control messages */
u32 rd_msg_hdr;
Expand Down

0 comments on commit a9f6b13

Please sign in to comment.