Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2e647124

drivers/misc/mei/hw-me.c

+0 −8
Original line number Diff line number Diff line
@@ -583,14 +583,6 @@ struct mei_device *mei_me_dev_init(struct pci_dev *pdev) 


	mei_device_init(dev);



	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);



	INIT_DELAYED_WORK(&dev->timer_work, mei_timer);

	INIT_WORK(&dev->init_work, mei_host_client_init);



	dev->ops = &mei_me_hw_ops;



	dev->pdev = pdev;

drivers/misc/mei/init.c

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



}



/**