diff options
Diffstat (limited to 'drivers/pci/hotplug/pciehp_core.c')
-rw-r--r-- | drivers/pci/hotplug/pciehp_core.c | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c index e20cf8e42bd9..be608563e8b6 100644 --- a/drivers/pci/hotplug/pciehp_core.c +++ b/drivers/pci/hotplug/pciehp_core.c | |||
@@ -46,7 +46,6 @@ int pciehp_debug; | |||
46 | int pciehp_poll_mode; | 46 | int pciehp_poll_mode; |
47 | int pciehp_poll_time; | 47 | int pciehp_poll_time; |
48 | struct controller *pciehp_ctrl_list; | 48 | struct controller *pciehp_ctrl_list; |
49 | struct pci_func *pciehp_slot_list[256]; | ||
50 | 49 | ||
51 | #define DRIVER_VERSION "0.4" | 50 | #define DRIVER_VERSION "0.4" |
52 | #define DRIVER_AUTHOR "Dan Zink <dan.zink@compaq.com>, Greg Kroah-Hartman <greg@kroah.com>, Dely Sy <dely.l.sy@intel.com>" | 51 | #define DRIVER_AUTHOR "Dan Zink <dan.zink@compaq.com>, Greg Kroah-Hartman <greg@kroah.com>, Dely Sy <dely.l.sy@intel.com>" |
@@ -422,15 +421,6 @@ static int pciehp_probe(struct pcie_device *dev, const struct pcie_port_service_ | |||
422 | first_device_num = ctrl->slot_device_offset; | 421 | first_device_num = ctrl->slot_device_offset; |
423 | num_ctlr_slots = ctrl->num_slots; | 422 | num_ctlr_slots = ctrl->num_slots; |
424 | 423 | ||
425 | /* Store PCI Config Space for all devices on this bus */ | ||
426 | dbg("%s: Before calling pciehp_save_config, ctrl->bus %x,ctrl->slot_bus %x\n", | ||
427 | __FUNCTION__,ctrl->bus, ctrl->slot_bus); | ||
428 | rc = pciehp_save_config(ctrl, ctrl->slot_bus, num_ctlr_slots, first_device_num); | ||
429 | if (rc) { | ||
430 | err("%s: unable to save PCI configuration data, error %d\n", __FUNCTION__, rc); | ||
431 | goto err_out_free_ctrl_bus; | ||
432 | } | ||
433 | |||
434 | ctrl->add_support = 1; | 424 | ctrl->add_support = 1; |
435 | 425 | ||
436 | /* Setup the slot information structures */ | 426 | /* Setup the slot information structures */ |
@@ -491,7 +481,6 @@ err_out_none: | |||
491 | 481 | ||
492 | static int pcie_start_thread(void) | 482 | static int pcie_start_thread(void) |
493 | { | 483 | { |
494 | int loop; | ||
495 | int retval = 0; | 484 | int retval = 0; |
496 | 485 | ||
497 | dbg("Initialize + Start the notification/polling mechanism \n"); | 486 | dbg("Initialize + Start the notification/polling mechanism \n"); |
@@ -502,20 +491,11 @@ static int pcie_start_thread(void) | |||
502 | return retval; | 491 | return retval; |
503 | } | 492 | } |
504 | 493 | ||
505 | dbg("Initialize slot lists\n"); | ||
506 | /* One slot list for each bus in the system */ | ||
507 | for (loop = 0; loop < 256; loop++) { | ||
508 | pciehp_slot_list[loop] = NULL; | ||
509 | } | ||
510 | |||
511 | return retval; | 494 | return retval; |
512 | } | 495 | } |
513 | 496 | ||
514 | static void __exit unload_pciehpd(void) | 497 | static void __exit unload_pciehpd(void) |
515 | { | 498 | { |
516 | struct pci_func *next; | ||
517 | struct pci_func *TempSlot; | ||
518 | int loop; | ||
519 | struct controller *ctrl; | 499 | struct controller *ctrl; |
520 | struct controller *tctrl; | 500 | struct controller *tctrl; |
521 | 501 | ||
@@ -534,15 +514,6 @@ static void __exit unload_pciehpd(void) | |||
534 | kfree(tctrl); | 514 | kfree(tctrl); |
535 | } | 515 | } |
536 | 516 | ||
537 | for (loop = 0; loop < 256; loop++) { | ||
538 | next = pciehp_slot_list[loop]; | ||
539 | while (next != NULL) { | ||
540 | TempSlot = next; | ||
541 | next = next->next; | ||
542 | kfree(TempSlot); | ||
543 | } | ||
544 | } | ||
545 | |||
546 | /* Stop the notification mechanism */ | 517 | /* Stop the notification mechanism */ |
547 | pciehp_event_stop_thread(); | 518 | pciehp_event_stop_thread(); |
548 | 519 | ||