summaryrefslogtreecommitdiffstats
path: root/drivers/pci/setup-bus.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/pci/setup-bus.c')
-rw-r--r--drivers/pci/setup-bus.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index fd9b545c3cf5..2f053922dd5c 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -68,7 +68,7 @@ static int add_to_list(struct list_head *head,
68 68
69 tmp = kzalloc(sizeof(*tmp), GFP_KERNEL); 69 tmp = kzalloc(sizeof(*tmp), GFP_KERNEL);
70 if (!tmp) { 70 if (!tmp) {
71 pr_warning("add_to_list: kmalloc() failed!\n"); 71 pr_warn("add_to_list: kmalloc() failed!\n");
72 return -ENOMEM; 72 return -ENOMEM;
73 } 73 }
74 74
@@ -736,7 +736,7 @@ static resource_size_t calculate_iosize(resource_size_t size,
736{ 736{
737 if (size < min_size) 737 if (size < min_size)
738 size = min_size; 738 size = min_size;
739 if (old_size == 1 ) 739 if (old_size == 1)
740 old_size = 0; 740 old_size = 0;
741 /* To be fixed in 2.5: we should have sort of HAVE_ISA 741 /* To be fixed in 2.5: we should have sort of HAVE_ISA
742 flag in the struct pci_bus. */ 742 flag in the struct pci_bus. */
@@ -757,7 +757,7 @@ static resource_size_t calculate_memsize(resource_size_t size,
757{ 757{
758 if (size < min_size) 758 if (size < min_size)
759 size = min_size; 759 size = min_size;
760 if (old_size == 1 ) 760 if (old_size == 1)
761 old_size = 0; 761 old_size = 0;
762 if (size < old_size) 762 if (size < old_size)
763 size = old_size; 763 size = old_size;
@@ -1430,10 +1430,10 @@ static void pci_bus_dump_res(struct pci_bus *bus)
1430 1430
1431 pci_bus_for_each_resource(bus, res, i) { 1431 pci_bus_for_each_resource(bus, res, i) {
1432 if (!res || !res->end || !res->flags) 1432 if (!res || !res->end || !res->flags)
1433 continue; 1433 continue;
1434 1434
1435 dev_printk(KERN_DEBUG, &bus->dev, "resource %d %pR\n", i, res); 1435 dev_printk(KERN_DEBUG, &bus->dev, "resource %d %pR\n", i, res);
1436 } 1436 }
1437} 1437}
1438 1438
1439static void pci_bus_dump_resources(struct pci_bus *bus) 1439static void pci_bus_dump_resources(struct pci_bus *bus)
@@ -1458,7 +1458,7 @@ static int pci_bus_get_depth(struct pci_bus *bus)
1458 int depth = 0; 1458 int depth = 0;
1459 struct pci_bus *child_bus; 1459 struct pci_bus *child_bus;
1460 1460
1461 list_for_each_entry(child_bus, &bus->children, node){ 1461 list_for_each_entry(child_bus, &bus->children, node) {
1462 int ret; 1462 int ret;
1463 1463
1464 ret = pci_bus_get_depth(child_bus); 1464 ret = pci_bus_get_depth(child_bus);