summaryrefslogtreecommitdiff
path: root/drivers/misc/mei/hw-me.c
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2014-09-29 16:31:41 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-09-29 11:56:01 -0400
commit3a7e9b6c661a23429b4a106d1ffa8aa5ce6c62bb (patch)
tree1a78e20c01d09cfb3c097a64f9a99db85f086b22 /drivers/misc/mei/hw-me.c
parent2190fe2a3f4a4e76f6c5ebfc1070b86b34f0345c (diff)
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-me.c')
-rw-r--r--drivers/misc/mei/hw-me.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/misc/mei/hw-me.c b/drivers/misc/mei/hw-me.c
index 56a9caa2e606..df42b6f6e7ca 100644
--- a/drivers/misc/mei/hw-me.c
+++ b/drivers/misc/mei/hw-me.c
@@ -824,10 +824,8 @@ struct mei_device *mei_me_dev_init(struct pci_dev *pdev,
if (!dev)
return NULL;
- mei_device_init(dev, cfg);
-
- dev->ops = &mei_me_hw_ops;
-
+ mei_device_init(dev, &pdev->dev, &mei_me_hw_ops);
+ dev->cfg = cfg;
dev->pdev = pdev;
return dev;
}