diff options
Diffstat (limited to 'drivers/pci/hotplug/shpchp_ctrl.c')
-rw-r--r-- | drivers/pci/hotplug/shpchp_ctrl.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/pci/hotplug/shpchp_ctrl.c b/drivers/pci/hotplug/shpchp_ctrl.c index 8541180781e1..58619359ad08 100644 --- a/drivers/pci/hotplug/shpchp_ctrl.c +++ b/drivers/pci/hotplug/shpchp_ctrl.c | |||
@@ -505,9 +505,7 @@ static int board_added(struct slot *p_slot) | |||
505 | up(&ctrl->crit_sect); | 505 | up(&ctrl->crit_sect); |
506 | 506 | ||
507 | /* Wait for ~1 second */ | 507 | /* Wait for ~1 second */ |
508 | dbg("%s: before long_delay\n", __FUNCTION__); | ||
509 | wait_for_ctrl_irq (ctrl); | 508 | wait_for_ctrl_irq (ctrl); |
510 | dbg("%s: after long_delay\n", __FUNCTION__); | ||
511 | 509 | ||
512 | dbg("%s: slot status = %x\n", __FUNCTION__, p_slot->status); | 510 | dbg("%s: slot status = %x\n", __FUNCTION__, p_slot->status); |
513 | /* Check for a power fault */ | 511 | /* Check for a power fault */ |
@@ -666,13 +664,11 @@ static void shpchp_pushbutton_thread (unsigned long slot) | |||
666 | p_slot->hpc_ops->get_power_status(p_slot, &getstatus); | 664 | p_slot->hpc_ops->get_power_status(p_slot, &getstatus); |
667 | if (getstatus) { | 665 | if (getstatus) { |
668 | p_slot->state = POWEROFF_STATE; | 666 | p_slot->state = POWEROFF_STATE; |
669 | dbg("In power_down_board, b:d(%x:%x)\n", p_slot->bus, p_slot->device); | ||
670 | 667 | ||
671 | shpchp_disable_slot(p_slot); | 668 | shpchp_disable_slot(p_slot); |
672 | p_slot->state = STATIC_STATE; | 669 | p_slot->state = STATIC_STATE; |
673 | } else { | 670 | } else { |
674 | p_slot->state = POWERON_STATE; | 671 | p_slot->state = POWERON_STATE; |
675 | dbg("In add_board, b:d(%x:%x)\n", p_slot->bus, p_slot->device); | ||
676 | 672 | ||
677 | if (shpchp_enable_slot(p_slot)) { | 673 | if (shpchp_enable_slot(p_slot)) { |
678 | /* Wait for exclusive access to hardware */ | 674 | /* Wait for exclusive access to hardware */ |
@@ -734,7 +730,6 @@ int shpchp_event_start_thread (void) | |||
734 | err ("Can't start up our event thread\n"); | 730 | err ("Can't start up our event thread\n"); |
735 | return -1; | 731 | return -1; |
736 | } | 732 | } |
737 | dbg("Our event thread pid = %d\n", pid); | ||
738 | return 0; | 733 | return 0; |
739 | } | 734 | } |
740 | 735 | ||
@@ -742,9 +737,7 @@ int shpchp_event_start_thread (void) | |||
742 | void shpchp_event_stop_thread (void) | 737 | void shpchp_event_stop_thread (void) |
743 | { | 738 | { |
744 | event_finished = 1; | 739 | event_finished = 1; |
745 | dbg("event_thread finish command given\n"); | ||
746 | up(&event_semaphore); | 740 | up(&event_semaphore); |
747 | dbg("wait for event_thread to exit\n"); | ||
748 | down(&event_exit); | 741 | down(&event_exit); |
749 | } | 742 | } |
750 | 743 | ||
@@ -776,7 +769,6 @@ static void interrupt_event_handler(struct controller *ctrl) | |||
776 | u8 getstatus; | 769 | u8 getstatus; |
777 | struct slot *p_slot; | 770 | struct slot *p_slot; |
778 | 771 | ||
779 | dbg("%s:\n", __FUNCTION__); | ||
780 | while (change) { | 772 | while (change) { |
781 | change = 0; | 773 | change = 0; |
782 | 774 | ||
@@ -788,9 +780,6 @@ static void interrupt_event_handler(struct controller *ctrl) | |||
788 | 780 | ||
789 | p_slot = shpchp_find_slot(ctrl, hp_slot + ctrl->slot_device_offset); | 781 | p_slot = shpchp_find_slot(ctrl, hp_slot + ctrl->slot_device_offset); |
790 | 782 | ||
791 | dbg("%s: hp_slot %d, p_slot %p\n", | ||
792 | __FUNCTION__, hp_slot, p_slot); | ||
793 | |||
794 | if (ctrl->event_queue[loop].event_type == INT_BUTTON_CANCEL) { | 783 | if (ctrl->event_queue[loop].event_type == INT_BUTTON_CANCEL) { |
795 | dbg("%s: button cancel\n", __FUNCTION__); | 784 | dbg("%s: button cancel\n", __FUNCTION__); |
796 | del_timer(&p_slot->task_event); | 785 | del_timer(&p_slot->task_event); |