evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pci: Stamp out pci_find_* usage in fakephp

Browse source 
pci_find is not hotplug safe, so it really doesn't want to be in an
actual hotplug driver either.

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Alan Cox 2006-09-29 18:36:15 +01:00 • committed by Greg Kroah-Hartman
parent 0bed208efc
commit 094ed76e89
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/pci/hotplug/fakephp.c
View file

@ -181,7 +181,9 @@ static void pci_rescan_slot(struct pci_dev *temp)
if (!pci_read_config_byte(temp, PCI_HEADER_TYPE, &hdr_type)) { if (!pci_read_config_byte(temp, PCI_HEADER_TYPE, &hdr_type)) {
temp->hdr_type = hdr_type & 0x7f; temp->hdr_type = hdr_type & 0x7f;
if (!pci_find_slot(bus->number, temp->devfn)) { if ((dev = pci_get_slot(bus, temp->devfn)) != NULL)
pci_dev_put(dev);
else {
dev = pci_scan_single_device(bus, temp->devfn); dev = pci_scan_single_device(bus, temp->devfn);
if (dev) { if (dev) {
dbg("New device on %s function %x:%x\n", dbg("New device on %s function %x:%x\n",
@ -205,7 +207,9 @@ static void pci_rescan_slot(struct pci_dev *temp)
continue; continue;
temp->hdr_type = hdr_type & 0x7f; temp->hdr_type = hdr_type & 0x7f;
if (!pci_find_slot(bus->number, temp->devfn)) { if ((dev = pci_get_slot(bus, temp->devfn)) != NULL)
pci_dev_put(dev);
else {
dev = pci_scan_single_device(bus, temp->devfn); dev = pci_scan_single_device(bus, temp->devfn);
if (dev) { if (dev) {
dbg("New device on %s function %x:%x\n", dbg("New device on %s function %x:%x\n",
@ -305,7 +309,7 @@ static int disable_slot(struct hotplug_slot *slot)
/* search for subfunctions and disable them first */ /* search for subfunctions and disable them first */
if (!(dslot->dev->devfn & 7)) { if (!(dslot->dev->devfn & 7)) {
for (func = 1; func < 8; func++) { for (func = 1; func < 8; func++) {
dev = pci_find_slot(dslot->dev->bus->number, dev = pci_get_slot(dslot->dev->bus,
dslot->dev->devfn + func); dslot->dev->devfn + func);
if (dev) { if (dev) {
hslot = get_slot_from_dev(dev); hslot = get_slot_from_dev(dev);
@ -315,6 +319,7 @@ static int disable_slot(struct hotplug_slot *slot)
err("Hotplug slot not found for subfunction of PCI device\n"); err("Hotplug slot not found for subfunction of PCI device\n");
return -ENODEV; return -ENODEV;
} }
pci_dev_put(dev);
} else } else
dbg("No device in slot found\n"); dbg("No device in slot found\n");
} }