diff options
| author | Tomas Winkler <tomas.winkler@intel.com> | 2014-09-29 16:31:45 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-29 11:56:01 -0400 |
| commit | 4ad96db6ccdd8b777cff5fd4aa74ec1e86f1afce (patch) | |
| tree | 1752b434d40b77db0784e17959fab3c3d2227ab1 /drivers/misc/mei/pci-txe.c | |
| parent | d08b8fc0dbdbe9bf7edeb46f7a856f993630664f (diff) | |
| download | op-kernel-dev-4ad96db6ccdd8b777cff5fd4aa74ec1e86f1afce.zip op-kernel-dev-4ad96db6ccdd8b777cff5fd4aa74ec1e86f1afce.tar.gz | |
mei: push pci cfg structure me hw
Device specific configurations are currently only needed by me hw
so we can remove it from txe
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/mei/pci-txe.c')
| -rw-r--r-- | drivers/misc/mei/pci-txe.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/misc/mei/pci-txe.c b/drivers/misc/mei/pci-txe.c index cd9dda7..69eb999 100644 --- a/drivers/misc/mei/pci-txe.c +++ b/drivers/misc/mei/pci-txe.c @@ -36,7 +36,8 @@ #include "hw-txe.h" static const struct pci_device_id mei_txe_pci_tbl[] = { - {MEI_PCI_DEVICE(0x0F18, mei_txe_cfg)}, /* Baytrail */ + {PCI_VDEVICE(INTEL, 0x0F18)}, /* Baytrail */ + {0, } }; MODULE_DEVICE_TABLE(pci, mei_txe_pci_tbl); @@ -70,7 +71,6 @@ static void mei_txe_pci_iounmap(struct pci_dev *pdev, struct mei_txe_hw *hw) */ static int mei_txe_probe(struct pci_dev *pdev, const struct pci_device_id *ent) { - const struct mei_cfg *cfg = (struct mei_cfg *)(ent->driver_data); struct mei_device *dev; struct mei_txe_hw *hw; int err; @@ -101,7 +101,7 @@ static int mei_txe_probe(struct pci_dev *pdev, const struct pci_device_id *ent) } /* allocates and initializes the mei dev structure */ - dev = mei_txe_dev_init(pdev, cfg); + dev = mei_txe_dev_init(pdev); if (!dev) { err = -ENOMEM; goto release_regions; |
