diff options
author | Tomas Winkler <tomas.winkler@intel.com> | 2014-09-29 09:31:41 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-29 11:56:01 -0400 |
commit | 3a7e9b6c661a23429b4a106d1ffa8aa5ce6c62bb (patch) | |
tree | 1a78e20c01d09cfb3c097a64f9a99db85f086b22 /drivers/misc/mei/hw-me.c | |
parent | 2190fe2a3f4a4e76f6c5ebfc1070b86b34f0345c (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.c | 6 |
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, | |||
824 | if (!dev) | 824 | if (!dev) |
825 | return NULL; | 825 | return NULL; |
826 | 826 | ||
827 | mei_device_init(dev, cfg); | 827 | mei_device_init(dev, &pdev->dev, &mei_me_hw_ops); |
828 | 828 | dev->cfg = cfg; | |
829 | dev->ops = &mei_me_hw_ops; | ||
830 | |||
831 | dev->pdev = pdev; | 829 | dev->pdev = pdev; |
832 | return dev; | 830 | return dev; |
833 | } | 831 | } |