aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/hotplug/ibmphp_res.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/pci/hotplug/ibmphp_res.c')
-rw-r--r--drivers/pci/hotplug/ibmphp_res.c48
1 files changed, 24 insertions, 24 deletions
diff --git a/drivers/pci/hotplug/ibmphp_res.c b/drivers/pci/hotplug/ibmphp_res.c
index 852a98bf07d3..5636b1ac2a2e 100644
--- a/drivers/pci/hotplug/ibmphp_res.c
+++ b/drivers/pci/hotplug/ibmphp_res.c
@@ -325,7 +325,7 @@ int __init ibmphp_rsrc_init (void)
325 if (!new_pfmem) 325 if (!new_pfmem)
326 return -ENOMEM; 326 return -ENOMEM;
327 new_pfmem->type = PFMEM; 327 new_pfmem->type = PFMEM;
328 new_pfmem->fromMem = FALSE; 328 new_pfmem->fromMem = 0;
329 if (ibmphp_add_resource (new_pfmem) < 0) { 329 if (ibmphp_add_resource (new_pfmem) < 0) {
330 newbus = alloc_error_bus (curr, 0, 0); 330 newbus = alloc_error_bus (curr, 0, 0);
331 if (!newbus) 331 if (!newbus)
@@ -462,7 +462,7 @@ static int add_range (int type, struct range_node *range, struct bus_node *bus_c
462static void update_resources (struct bus_node *bus_cur, int type, int rangeno) 462static void update_resources (struct bus_node *bus_cur, int type, int rangeno)
463{ 463{
464 struct resource_node *res = NULL; 464 struct resource_node *res = NULL;
465 u8 eol = FALSE; /* end of list indicator */ 465 u8 eol = 0; /* end of list indicator */
466 466
467 switch (type) { 467 switch (type) {
468 case MEM: 468 case MEM:
@@ -488,7 +488,7 @@ static void update_resources (struct bus_node *bus_cur, int type, int rangeno)
488 else if (res->nextRange) 488 else if (res->nextRange)
489 res = res->nextRange; 489 res = res->nextRange;
490 else { 490 else {
491 eol = TRUE; 491 eol = 1;
492 break; 492 break;
493 } 493 }
494 } 494 }
@@ -979,7 +979,7 @@ int ibmphp_check_resource (struct resource_node *res, u8 bridge)
979 int noranges = 0; 979 int noranges = 0;
980 u32 tmp_start; /* this is to make sure start address is divisible by the length needed */ 980 u32 tmp_start; /* this is to make sure start address is divisible by the length needed */
981 u32 tmp_divide; 981 u32 tmp_divide;
982 u8 flag = FALSE; 982 u8 flag = 0;
983 983
984 if (!res) 984 if (!res)
985 return -EINVAL; 985 return -EINVAL;
@@ -1046,17 +1046,17 @@ int ibmphp_check_resource (struct resource_node *res, u8 bridge)
1046 1046
1047 if ((range->start % tmp_divide) == 0) { 1047 if ((range->start % tmp_divide) == 0) {
1048 /* just perfect, starting address is divisible by length */ 1048 /* just perfect, starting address is divisible by length */
1049 flag = TRUE; 1049 flag = 1;
1050 len_cur = len_tmp; 1050 len_cur = len_tmp;
1051 start_cur = range->start; 1051 start_cur = range->start;
1052 } else { 1052 } else {
1053 /* Needs adjusting */ 1053 /* Needs adjusting */
1054 tmp_start = range->start; 1054 tmp_start = range->start;
1055 flag = FALSE; 1055 flag = 0;
1056 1056
1057 while ((len_tmp = res_cur->start - 1 - tmp_start) >= res->len) { 1057 while ((len_tmp = res_cur->start - 1 - tmp_start) >= res->len) {
1058 if ((tmp_start % tmp_divide) == 0) { 1058 if ((tmp_start % tmp_divide) == 0) {
1059 flag = TRUE; 1059 flag = 1;
1060 len_cur = len_tmp; 1060 len_cur = len_tmp;
1061 start_cur = tmp_start; 1061 start_cur = tmp_start;
1062 break; 1062 break;
@@ -1085,17 +1085,17 @@ int ibmphp_check_resource (struct resource_node *res, u8 bridge)
1085 1085
1086 if (((res_cur->end + 1) % tmp_divide) == 0) { 1086 if (((res_cur->end + 1) % tmp_divide) == 0) {
1087 /* just perfect, starting address is divisible by length */ 1087 /* just perfect, starting address is divisible by length */
1088 flag = TRUE; 1088 flag = 1;
1089 len_cur = len_tmp; 1089 len_cur = len_tmp;
1090 start_cur = res_cur->end + 1; 1090 start_cur = res_cur->end + 1;
1091 } else { 1091 } else {
1092 /* Needs adjusting */ 1092 /* Needs adjusting */
1093 tmp_start = res_cur->end + 1; 1093 tmp_start = res_cur->end + 1;
1094 flag = FALSE; 1094 flag = 0;
1095 1095
1096 while ((len_tmp = range->end - tmp_start) >= res->len) { 1096 while ((len_tmp = range->end - tmp_start) >= res->len) {
1097 if ((tmp_start % tmp_divide) == 0) { 1097 if ((tmp_start % tmp_divide) == 0) {
1098 flag = TRUE; 1098 flag = 1;
1099 len_cur = len_tmp; 1099 len_cur = len_tmp;
1100 start_cur = tmp_start; 1100 start_cur = tmp_start;
1101 break; 1101 break;
@@ -1123,17 +1123,17 @@ int ibmphp_check_resource (struct resource_node *res, u8 bridge)
1123 if ((len_tmp < len_cur) || (len_cur == 0)) { 1123 if ((len_tmp < len_cur) || (len_cur == 0)) {
1124 if ((range->start % tmp_divide) == 0) { 1124 if ((range->start % tmp_divide) == 0) {
1125 /* just perfect, starting address is divisible by length */ 1125 /* just perfect, starting address is divisible by length */
1126 flag = TRUE; 1126 flag = 1;
1127 len_cur = len_tmp; 1127 len_cur = len_tmp;
1128 start_cur = range->start; 1128 start_cur = range->start;
1129 } else { 1129 } else {
1130 /* Needs adjusting */ 1130 /* Needs adjusting */
1131 tmp_start = range->start; 1131 tmp_start = range->start;
1132 flag = FALSE; 1132 flag = 0;
1133 1133
1134 while ((len_tmp = res_cur->start - 1 - tmp_start) >= res->len) { 1134 while ((len_tmp = res_cur->start - 1 - tmp_start) >= res->len) {
1135 if ((tmp_start % tmp_divide) == 0) { 1135 if ((tmp_start % tmp_divide) == 0) {
1136 flag = TRUE; 1136 flag = 1;
1137 len_cur = len_tmp; 1137 len_cur = len_tmp;
1138 start_cur = tmp_start; 1138 start_cur = tmp_start;
1139 break; 1139 break;
@@ -1158,17 +1158,17 @@ int ibmphp_check_resource (struct resource_node *res, u8 bridge)
1158 if ((len_tmp < len_cur) || (len_cur == 0)) { 1158 if ((len_tmp < len_cur) || (len_cur == 0)) {
1159 if (((res_prev->end + 1) % tmp_divide) == 0) { 1159 if (((res_prev->end + 1) % tmp_divide) == 0) {
1160 /* just perfect, starting address's divisible by length */ 1160 /* just perfect, starting address's divisible by length */
1161 flag = TRUE; 1161 flag = 1;
1162 len_cur = len_tmp; 1162 len_cur = len_tmp;
1163 start_cur = res_prev->end + 1; 1163 start_cur = res_prev->end + 1;
1164 } else { 1164 } else {
1165 /* Needs adjusting */ 1165 /* Needs adjusting */
1166 tmp_start = res_prev->end + 1; 1166 tmp_start = res_prev->end + 1;
1167 flag = FALSE; 1167 flag = 0;
1168 1168
1169 while ((len_tmp = res_cur->start - 1 - tmp_start) >= res->len) { 1169 while ((len_tmp = res_cur->start - 1 - tmp_start) >= res->len) {
1170 if ((tmp_start % tmp_divide) == 0) { 1170 if ((tmp_start % tmp_divide) == 0) {
1171 flag = TRUE; 1171 flag = 1;
1172 len_cur = len_tmp; 1172 len_cur = len_tmp;
1173 start_cur = tmp_start; 1173 start_cur = tmp_start;
1174 break; 1174 break;
@@ -1217,17 +1217,17 @@ int ibmphp_check_resource (struct resource_node *res, u8 bridge)
1217 if ((len_tmp < len_cur) || (len_cur == 0)) { 1217 if ((len_tmp < len_cur) || (len_cur == 0)) {
1218 if ((range->start % tmp_divide) == 0) { 1218 if ((range->start % tmp_divide) == 0) {
1219 /* just perfect, starting address's divisible by length */ 1219 /* just perfect, starting address's divisible by length */
1220 flag = TRUE; 1220 flag = 1;
1221 len_cur = len_tmp; 1221 len_cur = len_tmp;
1222 start_cur = range->start; 1222 start_cur = range->start;
1223 } else { 1223 } else {
1224 /* Needs adjusting */ 1224 /* Needs adjusting */
1225 tmp_start = range->start; 1225 tmp_start = range->start;
1226 flag = FALSE; 1226 flag = 0;
1227 1227
1228 while ((len_tmp = range->end - tmp_start) >= res->len) { 1228 while ((len_tmp = range->end - tmp_start) >= res->len) {
1229 if ((tmp_start % tmp_divide) == 0) { 1229 if ((tmp_start % tmp_divide) == 0) {
1230 flag = TRUE; 1230 flag = 1;
1231 len_cur = len_tmp; 1231 len_cur = len_tmp;
1232 start_cur = tmp_start; 1232 start_cur = tmp_start;
1233 break; 1233 break;
@@ -1281,17 +1281,17 @@ int ibmphp_check_resource (struct resource_node *res, u8 bridge)
1281 if ((len_tmp < len_cur) || (len_cur == 0)) { 1281 if ((len_tmp < len_cur) || (len_cur == 0)) {
1282 if ((range->start % tmp_divide) == 0) { 1282 if ((range->start % tmp_divide) == 0) {
1283 /* just perfect, starting address's divisible by length */ 1283 /* just perfect, starting address's divisible by length */
1284 flag = TRUE; 1284 flag = 1;
1285 len_cur = len_tmp; 1285 len_cur = len_tmp;
1286 start_cur = range->start; 1286 start_cur = range->start;
1287 } else { 1287 } else {
1288 /* Needs adjusting */ 1288 /* Needs adjusting */
1289 tmp_start = range->start; 1289 tmp_start = range->start;
1290 flag = FALSE; 1290 flag = 0;
1291 1291
1292 while ((len_tmp = range->end - tmp_start) >= res->len) { 1292 while ((len_tmp = range->end - tmp_start) >= res->len) {
1293 if ((tmp_start % tmp_divide) == 0) { 1293 if ((tmp_start % tmp_divide) == 0) {
1294 flag = TRUE; 1294 flag = 1;
1295 len_cur = len_tmp; 1295 len_cur = len_tmp;
1296 start_cur = tmp_start; 1296 start_cur = tmp_start;
1297 break; 1297 break;
@@ -1684,7 +1684,7 @@ static int __init once_over (void)
1684 bus_cur = list_entry (tmp, struct bus_node, bus_list); 1684 bus_cur = list_entry (tmp, struct bus_node, bus_list);
1685 if ((!bus_cur->rangePFMem) && (bus_cur->firstPFMem)) { 1685 if ((!bus_cur->rangePFMem) && (bus_cur->firstPFMem)) {
1686 for (pfmem_cur = bus_cur->firstPFMem, pfmem_prev = NULL; pfmem_cur; pfmem_prev = pfmem_cur, pfmem_cur = pfmem_cur->next) { 1686 for (pfmem_cur = bus_cur->firstPFMem, pfmem_prev = NULL; pfmem_cur; pfmem_prev = pfmem_cur, pfmem_cur = pfmem_cur->next) {
1687 pfmem_cur->fromMem = TRUE; 1687 pfmem_cur->fromMem = 1;
1688 if (pfmem_prev) 1688 if (pfmem_prev)
1689 pfmem_prev->next = pfmem_cur->next; 1689 pfmem_prev->next = pfmem_cur->next;
1690 else 1690 else
@@ -2129,7 +2129,7 @@ static int __init update_bridge_ranges (struct bus_node **bus)
2129 pfmem->start = start_address; 2129 pfmem->start = start_address;
2130 pfmem->end = end_address + 0xfffff; 2130 pfmem->end = end_address + 0xfffff;
2131 pfmem->len = pfmem->end - pfmem->start + 1; 2131 pfmem->len = pfmem->end - pfmem->start + 1;
2132 pfmem->fromMem = FALSE; 2132 pfmem->fromMem = 0;
2133 2133
2134 ibmphp_add_resource (pfmem); 2134 ibmphp_add_resource (pfmem);
2135 } 2135 }