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

mei: move work initialization to mei_device_init 



Let mei_device_init initialize all the software constructs.

Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e7e0c231

drivers/misc/mei/init.c

+4 −0
Original line number Diff line number Diff line
@@ -76,6 +76,10 @@ struct mei_device *mei_device_init(struct pci_dev *pdev) 
	mei_io_list_init(&dev->ctrl_rd_list);

	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->pdev = pdev;

	return dev;

}

drivers/misc/mei/main.c

+0 −2
Original line number Diff line number Diff line
@@ -889,8 +889,6 @@ static int mei_probe(struct pci_dev *pdev, 
		       pdev->irq);

		goto disable_msi;

	}

	INIT_DELAYED_WORK(&dev->timer_work, mei_timer);

	INIT_WORK(&dev->init_work, mei_host_client_init);



	if (mei_hw_init(dev)) {

		dev_err(&pdev->dev, "init hw failure.\n");