summaryrefslogtreecommitdiffstats
path: root/drivers/vfio
diff options
context:
space:
mode:
authorSinan Kaya <okaya@codeaurora.org>2018-07-19 18:04:12 -0500
committerBjorn Helgaas <bhelgaas@google.com>2018-07-19 18:04:23 -0500
commit811c5cb37df46b0cd714dbd053d19cdb97d08cff (patch)
treec8cea541b7869d0ce1ae2f7d54fdafd650c6a3bf /drivers/vfio
parent381634cad15b711e033a2638d558232b60f753f6 (diff)
downloadlinux-stable-811c5cb37df46b0cd714dbd053d19cdb97d08cff.tar.gz
linux-stable-811c5cb37df46b0cd714dbd053d19cdb97d08cff.tar.bz2
linux-stable-811c5cb37df46b0cd714dbd053d19cdb97d08cff.zip
PCI: Unify try slot and bus reset API
Drivers are expected to call pci_try_reset_slot() or pci_try_reset_bus() by querying if a system supports hotplug or not. A survey showed that most drivers don't do this and we are leaking hotplug capability to the user. Hide pci_try_slot_reset() from drivers and embed into pci_try_bus_reset(). Change pci_try_reset_bus() parameter from struct pci_bus to struct pci_dev. Signed-off-by: Sinan Kaya <okaya@codeaurora.org> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'drivers/vfio')
-rw-r--r--drivers/vfio/pci/vfio_pci.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c
index b423a309a6e0..71018ec9065b 100644
--- a/drivers/vfio/pci/vfio_pci.c
+++ b/drivers/vfio/pci/vfio_pci.c
@@ -1010,8 +1010,7 @@ reset_info_exit:
&info, slot);
if (!ret)
/* User has access, do the reset */
- ret = slot ? pci_try_reset_slot(vdev->pdev->slot) :
- pci_try_reset_bus(vdev->pdev->bus);
+ ret = pci_try_reset_bus(vdev->pdev);
hot_reset_release:
for (i--; i >= 0; i--)
@@ -1373,8 +1372,7 @@ static void vfio_pci_try_bus_reset(struct vfio_pci_device *vdev)
}
if (needs_reset)
- ret = slot ? pci_try_reset_slot(vdev->pdev->slot) :
- pci_try_reset_bus(vdev->pdev->bus);
+ ret = pci_try_reset_bus(vdev->pdev);
put_devs:
for (i = 0; i < devs.cur_index; i++) {