diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2017-07-03 08:00:29 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2017-07-03 08:00:29 -0500 |
| commit | bb02ce95a59ee5b96579fab2e2e7635ee26d535b (patch) | |
| tree | 5a4b426761d6ccded785b88eb70e91f746a62fa1 /drivers/pci/iov.c | |
| parent | c781f85bc1958391e2d305fe6f52c90de0adb92e (diff) | |
| parent | 52354b9d1f46aae7386db7bb8ec8484b5488087f (diff) | |
Merge branch 'pci/virtualization' into next
* pci/virtualization:
PCI: Remove __pci_dev_reset() and pci_dev_reset()
PCI: Split ->reset_notify() method into ->reset_prepare() and ->reset_done()
PCI: Protect pci_error_handlers->reset_notify() usage with device_lock()
PCI: Protect pci_driver->sriov_configure() usage with device_lock()
PCI: Mark Intel XXV710 NIC INTx masking as broken
PCI: Restore PRI and PASID state after Function-Level Reset
PCI: Cache PRI and PASID bits in pci_dev
Diffstat (limited to 'drivers/pci/iov.c')
| -rw-r--r-- | drivers/pci/iov.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c index d9dc7363ac77..120485d6f352 100644 --- a/drivers/pci/iov.c +++ b/drivers/pci/iov.c @@ -461,8 +461,6 @@ found: else iov->dev = dev; - mutex_init(&iov->lock); - dev->sriov = iov; dev->is_physfn = 1; rc = compute_max_vf_buses(dev); @@ -491,8 +489,6 @@ static void sriov_release(struct pci_dev *dev) if (dev != dev->sriov->dev) pci_dev_put(dev->sriov->dev); - mutex_destroy(&dev->sriov->lock); - kfree(dev->sriov); dev->sriov = NULL; } |