]> Pileus Git - ~andy/linux/commitdiff
mei: remove write only need_reset member of struct mei_device
authorTomas Winkler <tomas.winkler@intel.com>
Tue, 8 Jan 2013 21:07:25 +0000 (23:07 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 9 Jan 2013 00:40:46 +0000 (16:40 -0800)
need_reset is not used anymore

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/misc/mei/init.c
drivers/misc/mei/mei_dev.h

index 70fad4ea474cb63ee0c05455c3162957bafc18a6..2391832bfa6f97fc1d7b6d75a9658364fc13f109 100644 (file)
@@ -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 &&
@@ -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)
index dcd7a44a806e069cbe05957a3d8fcd395f5f37d4..e42db314f7c2d4e99aa91b294dddef02d498f04f 100644 (file)
@@ -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;