ChangeSet 1.1022.1.10, 2003/02/24 16:30:40-08:00, greg@kroah.com
[PATCH] Compaq PCI Hotplug: remove unused walk of the device on insertion.
diff -Nru a/drivers/hotplug/cpqphp_pci.c b/drivers/hotplug/cpqphp_pci.c
--- a/drivers/hotplug/cpqphp_pci.c Mon Feb 24 17:15:24 2003
+++ b/drivers/hotplug/cpqphp_pci.c Mon Feb 24 17:15:24 2003
@@ -80,61 +80,14 @@
return fp;
}
-static int configure_visit_pci_dev (struct pci_dev_wrapped *wrapped_dev, struct pci_bus_wrapped *wrapped_bus)
-{
- struct pci_bus* bus = wrapped_bus->bus;
- struct pci_dev* dev = wrapped_dev->dev;
- struct pci_func *temp_func;
- int i=0;
-
- //We need to fix up the hotplug function representation with the linux representation
- do {
- temp_func = cpqhp_slot_find(dev->bus->number, dev->devfn >> 3, i++);
- } while (temp_func && (temp_func->function != (dev->devfn & 0x07)));
-
- if (temp_func) {
- temp_func->pci_dev = dev;
- } else {
- //We did not even find a hotplug rep of the function, create it
- //This code might be taken out if we can guarantee the creation of functions
- //in parallel (hotplug and Linux at the same time).
- dbg("@@@@@@@@@@@ cpqhp_slot_create in %s\n", __FUNCTION__);
- temp_func = cpqhp_slot_create(bus->number);
- if (temp_func == NULL)
- return -ENOMEM;
- temp_func->pci_dev = dev;
- }
-
- //Create /proc/bus/pci proc entry for this device and bus device is on
- //Notify the drivers of the change
- if (temp_func->pci_dev) {
-// pci_insert_device (temp_func->pci_dev, bus);
-// pci_proc_attach_device(temp_func->pci_dev);
-// pci_announce_device_to_drivers(temp_func->pci_dev);
- }
-
- return 0;
-}
-
-
-static struct pci_visit configure_functions = {
- .visit_pci_dev = configure_visit_pci_dev,
-};
-
int cpqhp_configure_device (struct controller* ctrl, struct pci_func* func)
{
unsigned char bus;
struct pci_dev dev0;
struct pci_bus *child;
- struct pci_dev* temp;
int rc = 0;
- struct pci_dev_wrapped wrapped_dev;
- struct pci_bus_wrapped wrapped_bus;
- memset(&wrapped_dev, 0, sizeof(struct pci_dev_wrapped));
- memset(&wrapped_bus, 0, sizeof(struct pci_bus_wrapped));
-
memset(&dev0, 0, sizeof(struct pci_dev));
if (func->pci_dev == NULL)
@@ -162,13 +115,6 @@
}
- temp = func->pci_dev;
-
- if (temp) {
- wrapped_dev.dev = temp;
- wrapped_bus.bus = temp->bus;
- rc = pci_visit_dev(&configure_functions, &wrapped_dev, &wrapped_bus);
- }
return rc;
}
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Fri Feb 28 2003 - 22:00:24 EST