Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c6a44ba9 authored by Sinan Kaya's avatar Sinan Kaya Committed by Bjorn Helgaas
Browse files

PCI: Rename pci_try_reset_bus() to pci_reset_bus() 



Now that the old implementation of pci_reset_bus() is gone, replace
pci_try_reset_bus() with pci_reset_bus().

Compared to the old implementation, new code will fail immmediately with
-EAGAIN if object lock cannot be obtained.

Signed-off-by: default avatarSinan Kaya <okaya@codeaurora.org>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent fe32e2fa

drivers/infiniband/hw/hfi1/pcie.c

+1 −1
Original line number Diff line number Diff line
@@ -905,7 +905,7 @@ static int trigger_sbr(struct hfi1_devdata *dd) 
	 * delay after a reset is required.  Per spec requirements,

	 * the link is either working or not after that point.

	 */

	return pci_try_reset_bus(dev);

	return pci_reset_bus(dev);

}



/*

drivers/pci/pci.c

+8 −8
Original line number Diff line number Diff line
@@ -4784,7 +4784,7 @@ int pci_probe_reset_slot(struct pci_slot *slot) 
EXPORT_SYMBOL_GPL(pci_probe_reset_slot);



/**

 * __pci_try_reset_slot - Try to reset a PCI slot

 * __pci_reset_slot - Try to reset a PCI slot

 * @slot: PCI slot to reset

 *

 * A PCI bus may host multiple slots, each slot may support a reset mechanism
@@ -4798,7 +4798,7 @@ EXPORT_SYMBOL_GPL(pci_probe_reset_slot); 
 *

 * Same as above except return -EAGAIN if the slot cannot be locked

 */

static int __pci_try_reset_slot(struct pci_slot *slot)

static int __pci_reset_slot(struct pci_slot *slot)

{

	int rc;
@@ -4854,12 +4854,12 @@ int pci_probe_reset_bus(struct pci_bus *bus) 
EXPORT_SYMBOL_GPL(pci_probe_reset_bus);



/**

 * __pci_try_reset_bus - Try to reset a PCI bus

 * __pci_reset_bus - Try to reset a PCI bus

 * @bus: top level PCI bus to reset

 *

 * Same as above except return -EAGAIN if the bus cannot be locked

 */

static int __pci_try_reset_bus(struct pci_bus *bus)

static int __pci_reset_bus(struct pci_bus *bus)

{

	int rc;
@@ -4882,17 +4882,17 @@ static int __pci_try_reset_bus(struct pci_bus *bus) 
}



/**

 * pci_try_reset_bus - Try to reset a PCI bus

 * pci_reset_bus - Try to reset a PCI bus

 * @pdev: top level PCI device to reset via slot/bus

 *

 * Same as above except return -EAGAIN if the bus cannot be locked

 */

int pci_try_reset_bus(struct pci_dev *pdev)

int pci_reset_bus(struct pci_dev *pdev)

{

	return pci_probe_reset_slot(pdev->slot) ?

	    __pci_try_reset_slot(pdev->slot) : __pci_try_reset_bus(pdev->bus);

	    __pci_reset_slot(pdev->slot) : __pci_reset_bus(pdev->bus);

}

EXPORT_SYMBOL_GPL(pci_try_reset_bus);

EXPORT_SYMBOL_GPL(pci_reset_bus);



/**

 * pcix_get_max_mmrbc - get PCI-X maximum designed memory read byte count

drivers/vfio/pci/vfio_pci.c

+2 −2
Original line number Diff line number Diff line
@@ -1010,7 +1010,7 @@ static long vfio_pci_ioctl(void *device_data, 
						    &info, slot);

		if (!ret)

			/* User has access, do the reset */

			ret = pci_try_reset_bus(vdev->pdev);

			ret = pci_reset_bus(vdev->pdev);



hot_reset_release:

		for (i--; i >= 0; i--)
@@ -1372,7 +1372,7 @@ static void vfio_pci_try_bus_reset(struct vfio_pci_device *vdev) 
	}



	if (needs_reset)

		ret = pci_try_reset_bus(vdev->pdev);

		ret = pci_reset_bus(vdev->pdev);



put_devs:

	for (i = 0; i < devs.cur_index; i++) {

include/linux/pci.h

+1 −1
Original line number Diff line number Diff line
@@ -1097,7 +1097,7 @@ int pci_reset_function_locked(struct pci_dev *dev); 
int pci_try_reset_function(struct pci_dev *dev);

int pci_probe_reset_slot(struct pci_slot *slot);

int pci_probe_reset_bus(struct pci_bus *bus);

int pci_try_reset_bus(struct pci_dev *dev);

int pci_reset_bus(struct pci_dev *dev);

void pci_reset_secondary_bus(struct pci_dev *dev);

void pcibios_reset_secondary_bus(struct pci_dev *dev);

void pci_update_resource(struct pci_dev *dev, int resno);