hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PCI: Deprecate pci_reset_bus() and pci_reset_slot() functions 

pci_reset_bus() and pci_reset_slot() functions are not being used by any
code.  Remove them from the kernel in favor of pci_try_reset_bus() and
pci_try_reset_slot() functions.

Signed-off-by: Sinan Kaya <okaya@codeaurora.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
This commit is contained in:
Sinan Kaya 2018-07-19 18:04:14 -05:00 committed by Bjorn Helgaas
parent 811c5cb37d
commit fe32e2fa65
2 changed files with 1 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
drivers/pci/pci.c
View File

@ -4784,7 +4784,7 @@ int pci_probe_reset_slot(struct pci_slot *slot)
EXPORT_SYMBOL_GPL(pci_probe_reset_slot); EXPORT_SYMBOL_GPL(pci_probe_reset_slot);
/** /**
* pci_reset_slot - reset a PCI slot * __pci_try_reset_slot - Try to reset a PCI slot
* @slot: PCI slot to reset * @slot: PCI slot to reset
* *
* A PCI bus may host multiple slots, each slot may support a reset mechanism * A PCI bus may host multiple slots, each slot may support a reset mechanism
@ -4796,30 +4796,6 @@ EXPORT_SYMBOL_GPL(pci_probe_reset_slot);
* through this function. PCI config space of all devices in the slot and * through this function. PCI config space of all devices in the slot and
* behind the slot is saved before and restored after reset. * behind the slot is saved before and restored after reset.
* *
* Return 0 on success, non-zero on error.
*/
int pci_reset_slot(struct pci_slot *slot)
{
int rc;
rc = pci_slot_reset(slot, 1);
if (rc)
return rc;
pci_slot_save_and_disable(slot);
rc = pci_slot_reset(slot, 0);
pci_slot_restore(slot);
return rc;
}
EXPORT_SYMBOL_GPL(pci_reset_slot);
/**
* __pci_try_reset_slot - Try to reset a PCI slot
* @slot: PCI slot to reset
*
* Same as above except return -EAGAIN if the slot cannot be locked * 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_try_reset_slot(struct pci_slot *slot)
@ -4877,33 +4853,6 @@ int pci_probe_reset_bus(struct pci_bus *bus)
} }
EXPORT_SYMBOL_GPL(pci_probe_reset_bus); EXPORT_SYMBOL_GPL(pci_probe_reset_bus);
/**
* pci_reset_bus - reset a PCI bus
* @bus: top level PCI bus to reset
*
* Do a bus reset on the given bus and any subordinate buses, saving
* and restoring state of all devices.
*
* Return 0 on success, non-zero on error.
*/
int pci_reset_bus(struct pci_bus *bus)
{
int rc;
rc = pci_bus_reset(bus, 1);
if (rc)
return rc;
pci_bus_save_and_disable(bus);
rc = pci_bus_reset(bus, 0);
pci_bus_restore(bus);
return rc;
}
EXPORT_SYMBOL_GPL(pci_reset_bus);
/** /**
* __pci_try_reset_bus - Try to reset a PCI bus * __pci_try_reset_bus - Try to reset a PCI bus
* @bus: top level PCI bus to reset * @bus: top level PCI bus to reset

2
include/linux/pci.h
View File

@ -1096,9 +1096,7 @@ int pci_reset_function(struct pci_dev *dev);
int pci_reset_function_locked(struct pci_dev *dev); int pci_reset_function_locked(struct pci_dev *dev);
int pci_try_reset_function(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_slot(struct pci_slot *slot);
int pci_reset_slot(struct pci_slot *slot);
int pci_probe_reset_bus(struct pci_bus *bus); int pci_probe_reset_bus(struct pci_bus *bus);
int pci_reset_bus(struct pci_bus *bus);
int pci_try_reset_bus(struct pci_dev *dev); int pci_try_reset_bus(struct pci_dev *dev);
void pci_reset_secondary_bus(struct pci_dev *dev); void pci_reset_secondary_bus(struct pci_dev *dev);
void pcibios_reset_secondary_bus(struct pci_dev *dev); void pcibios_reset_secondary_bus(struct pci_dev *dev);