Commit 4991bcbc authored by David S. Miller's avatar David S. Miller

[SPARC64]: Use pci_remove_bus_device to delete, found by Ben Collins.

parent dce59451
...@@ -78,20 +78,6 @@ static int __init find_device_prom_node(struct pci_pbm_info *pbm, ...@@ -78,20 +78,6 @@ static int __init find_device_prom_node(struct pci_pbm_info *pbm,
return 0; return 0;
} }
/* Remove a PCI device from the device trees, then
* free it up. Note that this must run before
* the device's resources are registered because we
* do not handle unregistering them here.
*/
static void pci_device_delete(struct pci_dev *pdev)
{
list_del(&pdev->global_list);
list_del(&pdev->bus_list);
/* Ok, all references are gone, free it up. */
kfree(pdev);
}
/* Older versions of OBP on PCI systems encode 64-bit MEM /* Older versions of OBP on PCI systems encode 64-bit MEM
* space assignments incorrectly, this fixes them up. We also * space assignments incorrectly, this fixes them up. We also
* take the opportunity here to hide other kinds of bogus * take the opportunity here to hide other kinds of bogus
...@@ -164,7 +150,7 @@ static void __init pdev_cookie_fillin(struct pci_pbm_info *pbm, ...@@ -164,7 +150,7 @@ static void __init pdev_cookie_fillin(struct pci_pbm_info *pbm,
* second EBUS/HappyMeal pair if the external * second EBUS/HappyMeal pair if the external
* connector for it is not present. * connector for it is not present.
*/ */
pci_device_delete(pdev); pci_remove_bus_device(pdev);
return; return;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment