aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/hotplug/ibmphp_core.c2
-rw-r--r--drivers/pci/hotplug/ibmphp_ebda.c2
-rw-r--r--drivers/pci/hotplug/ibmphp_pci.c2
-rw-r--r--drivers/pci/setup-bus.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/pci/hotplug/ibmphp_core.c b/drivers/pci/hotplug/ibmphp_core.c
index 4fda7e6a86a7..01cc054eb0d5 100644
--- a/drivers/pci/hotplug/ibmphp_core.c
+++ b/drivers/pci/hotplug/ibmphp_core.c
@@ -760,7 +760,7 @@ static u8 bus_structure_fixup(u8 busno)
760 for (dev->devfn = 0; dev->devfn < 256; dev->devfn += 8) { 760 for (dev->devfn = 0; dev->devfn < 256; dev->devfn += 8) {
761 if (!pci_read_config_word(dev, PCI_VENDOR_ID, &l) && 761 if (!pci_read_config_word(dev, PCI_VENDOR_ID, &l) &&
762 (l != 0x0000) && (l != 0xffff)) { 762 (l != 0x0000) && (l != 0xffff)) {
763 debug("%s - Inside bus_struture_fixup()\n", 763 debug("%s - Inside bus_structure_fixup()\n",
764 __func__); 764 __func__);
765 pci_scan_bus(busno, ibmphp_pci_bus->ops, NULL); 765 pci_scan_bus(busno, ibmphp_pci_bus->ops, NULL);
766 break; 766 break;
diff --git a/drivers/pci/hotplug/ibmphp_ebda.c b/drivers/pci/hotplug/ibmphp_ebda.c
index 714ca5c4ed50..9df78bc14541 100644
--- a/drivers/pci/hotplug/ibmphp_ebda.c
+++ b/drivers/pci/hotplug/ibmphp_ebda.c
@@ -784,7 +784,7 @@ static int __init ebda_rsrc_controller (void)
784 hpc_ptr->ctlr_relative_id = ctlr; 784 hpc_ptr->ctlr_relative_id = ctlr;
785 hpc_ptr->slot_count = slot_num; 785 hpc_ptr->slot_count = slot_num;
786 hpc_ptr->bus_count = bus_num; 786 hpc_ptr->bus_count = bus_num;
787 debug ("now enter ctlr data struture ---\n"); 787 debug ("now enter ctlr data structure ---\n");
788 debug ("ctlr id: %x\n", ctlr_id); 788 debug ("ctlr id: %x\n", ctlr_id);
789 debug ("ctlr_relative_id: %x\n", hpc_ptr->ctlr_relative_id); 789 debug ("ctlr_relative_id: %x\n", hpc_ptr->ctlr_relative_id);
790 debug ("count of slots controlled by this ctlr: %x\n", slot_num); 790 debug ("count of slots controlled by this ctlr: %x\n", slot_num);
diff --git a/drivers/pci/hotplug/ibmphp_pci.c b/drivers/pci/hotplug/ibmphp_pci.c
index 7b09e16173ad..c60f5f3e838d 100644
--- a/drivers/pci/hotplug/ibmphp_pci.c
+++ b/drivers/pci/hotplug/ibmphp_pci.c
@@ -109,7 +109,7 @@ int ibmphp_configure_card (struct pci_func *func, u8 slotno)
109 109
110 cur_func->function = function; 110 cur_func->function = function;
111 111
112 debug ("inside the loop, cur_func->busno = %x, cur_func->device = %x, cur_func->funcion = %x\n", 112 debug ("inside the loop, cur_func->busno = %x, cur_func->device = %x, cur_func->function = %x\n",
113 cur_func->busno, cur_func->device, cur_func->function); 113 cur_func->busno, cur_func->device, cur_func->function);
114 114
115 pci_bus_read_config_word (ibmphp_pci_bus, devfn, PCI_VENDOR_ID, &vendor_id); 115 pci_bus_read_config_word (ibmphp_pci_bus, devfn, PCI_VENDOR_ID, &vendor_id);
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 8fa2d4be88de..a7ba6de588a8 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -308,7 +308,7 @@ static void __assign_resources_sorted(struct list_head *head,
308 * Should not assign requested resources at first. 308 * Should not assign requested resources at first.
309 * they could be adjacent, so later reassign can not reallocate 309 * they could be adjacent, so later reassign can not reallocate
310 * them one by one in parent resource window. 310 * them one by one in parent resource window.
311 * Try to assign requested + add_size at begining 311 * Try to assign requested + add_size at beginning
312 * if could do that, could get out early. 312 * if could do that, could get out early.
313 * if could not do that, we still try to assign requested at first, 313 * if could not do that, we still try to assign requested at first,
314 * then try to reassign add_size for some resources. 314 * then try to reassign add_size for some resources.