summaryrefslogtreecommitdiffstats
path: root/drivers/misc/mei/hw-txe.c
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2014-09-29 15:31:41 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-09-29 17:56:01 +0200
commit3a7e9b6c661a23429b4a106d1ffa8aa5ce6c62bb (patch)
tree1a78e20c01d09cfb3c097a64f9a99db85f086b22 /drivers/misc/mei/hw-txe.c
parentmei: move mei_hbm_hdr function from hbm.h the hbm.c (diff)
downloadlinux-3a7e9b6c661a23429b4a106d1ffa8aa5ce6c62bb.tar.xz
linux-3a7e9b6c661a23429b4a106d1ffa8aa5ce6c62bb.zip
mei: push all standard settings into mei_device_init
Setting of hw_ops and device has should be in mei_device_init. We add reference to the parent device and remove pci dependent cfg Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/mei/hw-txe.c')
-rw-r--r--drivers/misc/mei/hw-txe.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/misc/mei/hw-txe.c b/drivers/misc/mei/hw-txe.c
index 1855b3b1ab21..fc1a51f818d0 100644
--- a/drivers/misc/mei/hw-txe.c
+++ b/drivers/misc/mei/hw-txe.c
@@ -1123,14 +1123,13 @@ struct mei_device *mei_txe_dev_init(struct pci_dev *pdev,
if (!dev)
return NULL;
- mei_device_init(dev, cfg);
+ mei_device_init(dev, &pdev->dev, &mei_txe_hw_ops);
hw = to_txe_hw(dev);
init_waitqueue_head(&hw->wait_aliveness_resp);
- dev->ops = &mei_txe_hw_ops;
-
+ dev->cfg = cfg;
dev->pdev = pdev;
return dev;
}