aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2013-01-08 16:07:25 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-08 19:40:46 -0500
commita9f6b133ab97bd481d82731a30b7d4a90427f56a (patch)
treeac6f77efbef0351707a174774383c22731fdcb8a
parentd025284d06458367cd833a5aceca901fb6da3785 (diff)
mei: remove write only need_reset member of struct mei_device
need_reset is not used anymore Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/misc/mei/init.c6
-rw-r--r--drivers/misc/mei/mei_dev.h1
2 files changed, 1 insertions, 6 deletions
diff --git a/drivers/misc/mei/init.c b/drivers/misc/mei/init.c
index 70fad4ea474c..2391832bfa6f 100644
--- a/drivers/misc/mei/init.c
+++ b/drivers/misc/mei/init.c
@@ -199,10 +199,8 @@ void mei_reset(struct mei_device *dev, int interrupts_enabled)
199 struct mei_cl_cb *cb_next = NULL; 199 struct mei_cl_cb *cb_next = NULL;
200 bool unexpected; 200 bool unexpected;
201 201
202 if (dev->dev_state == MEI_DEV_RECOVERING_FROM_RESET) { 202 if (dev->dev_state == MEI_DEV_RECOVERING_FROM_RESET)
203 dev->need_reset = true;
204 return; 203 return;
205 }
206 204
207 unexpected = (dev->dev_state != MEI_DEV_INITIALIZING && 205 unexpected = (dev->dev_state != MEI_DEV_INITIALIZING &&
208 dev->dev_state != MEI_DEV_DISABLED && 206 dev->dev_state != MEI_DEV_DISABLED &&
@@ -224,8 +222,6 @@ void mei_reset(struct mei_device *dev, int interrupts_enabled)
224 dev_dbg(&dev->pdev->dev, "currently saved host_hw_state = 0x%08x.\n", 222 dev_dbg(&dev->pdev->dev, "currently saved host_hw_state = 0x%08x.\n",
225 dev->host_hw_state); 223 dev->host_hw_state);
226 224
227 dev->need_reset = false;
228
229 if (dev->dev_state != MEI_DEV_INITIALIZING) { 225 if (dev->dev_state != MEI_DEV_INITIALIZING) {
230 if (dev->dev_state != MEI_DEV_DISABLED && 226 if (dev->dev_state != MEI_DEV_DISABLED &&
231 dev->dev_state != MEI_DEV_POWER_DOWN) 227 dev->dev_state != MEI_DEV_POWER_DOWN)
diff --git a/drivers/misc/mei/mei_dev.h b/drivers/misc/mei/mei_dev.h
index dcd7a44a806e..e42db314f7c2 100644
--- a/drivers/misc/mei/mei_dev.h
+++ b/drivers/misc/mei/mei_dev.h
@@ -260,7 +260,6 @@ struct mei_device {
260 enum mei_dev_state dev_state; 260 enum mei_dev_state dev_state;
261 enum mei_init_clients_states init_clients_state; 261 enum mei_init_clients_states init_clients_state;
262 u16 init_clients_timer; 262 u16 init_clients_timer;
263 bool need_reset;
264 263
265 unsigned char rd_msg_buf[MEI_RD_MSG_BUF_SIZE]; /* control messages */ 264 unsigned char rd_msg_buf[MEI_RD_MSG_BUF_SIZE]; /* control messages */
266 u32 rd_msg_hdr; 265 u32 rd_msg_hdr;