summaryrefslogtreecommitdiffstats
path: root/drivers/misc/mei/init.c
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2013-03-27 15:58:27 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-29 16:32:21 +0100
commitd0265f1202e82a27a015cb24635d85f3ab9ae4d5 (patch)
tree990535d621e22de92a51f819cf34b5c51e6f07be /drivers/misc/mei/init.c
parentmei: unregister watchdog from mei_stop function (diff)
downloadlinux-d0265f1202e82a27a015cb24635d85f3ab9ae4d5.tar.xz
linux-d0265f1202e82a27a015cb24635d85f3ab9ae4d5.zip
mei: ME structures should be initialized in mei_device_init
mei_timer and mei_host_client_init belongs to mei framework and are not ME hw specific. AMTHIF and WD are available only for ME but are above the hardware layer so move the initialization back from mei_me_dev_init to mei_device_init. Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/mei/init.c')
-rw-r--r--drivers/misc/mei/init.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/misc/mei/init.c b/drivers/misc/mei/init.c
index aced38c9f6a8..33f56308ba3c 100644
--- a/drivers/misc/mei/init.c
+++ b/drivers/misc/mei/init.c
@@ -57,6 +57,15 @@ void mei_device_init(struct mei_device *dev)
mei_io_list_init(&dev->write_waiting_list);
mei_io_list_init(&dev->ctrl_wr_list);
mei_io_list_init(&dev->ctrl_rd_list);
+
+ INIT_DELAYED_WORK(&dev->timer_work, mei_timer);
+ INIT_WORK(&dev->init_work, mei_host_client_init);
+
+ INIT_LIST_HEAD(&dev->wd_cl.link);
+ INIT_LIST_HEAD(&dev->iamthif_cl.link);
+ mei_io_list_init(&dev->amthif_cmd_list);
+ mei_io_list_init(&dev->amthif_rd_complete_list);
+
}
/**