We need to save/restore resources several times for alt_size support,
separate the save_resources()/resources() to save some lines later.
Signed-off-by: Yinghai Lu <yinghai@xxxxxxxxxx>
---
drivers/pci/setup-bus.c | 49 ++++++++++++++++++++++++++++++-------------------
1 file changed, 30 insertions(+), 19 deletions(-)
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index ccc6f9d..4a1fb4f 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -430,6 +430,29 @@ static bool pci_need_to_release(unsigned long mask, struct resource *res)
return false; /* should not get here */
}
+static bool save_resources(struct list_head *head,
+ struct list_head *save_head)
+{
+ struct pci_dev_resource *dev_res;
+
+ /* Save original start, end, flags etc at first */
+ list_for_each_entry(dev_res, head, list)
+ if (add_to_list(save_head, dev_res->dev, dev_res->res)) {
+ free_list(save_head);
+ return false;
+ }
+
+ return true;
+}
+
+static void restore_resource(struct pci_dev_resource *save_res,
+ struct resource *res)
+{
+ res->start = save_res->start;
+ res->end = save_res->end;
+ res->flags = save_res->flags;
+}
+
static void __assign_resources_sorted(struct list_head *head,
struct list_head *realloc_head,
struct list_head *fail_head)
@@ -467,13 +490,8 @@ static void __assign_resources_sorted(struct list_head *head,
if (!realloc_head || list_empty(realloc_head))
goto requested_and_reassign;
- /* Save original start, end, flags etc at first */
- list_for_each_entry(dev_res, head, list) {
- if (add_to_list(&save_head, dev_res->dev, dev_res->res)) {
- free_list(&save_head);
- goto requested_and_reassign;
- }
- }
+ if (!save_resources(head, &save_head))
+ goto requested_and_reassign;
/* Update res in head list with add_size in realloc_head list */
list_for_each_entry(dev_res, head, list) {
@@ -542,12 +560,9 @@ static void __assign_resources_sorted(struct list_head *head,
}
}
/* Restore start/end/flags from saved list */
- list_for_each_entry(save_res, &save_head, list) {
- res = save_res->res;
- res->start = save_res->start;
- res->end = save_res->end;
- res->flags = save_res->flags;
- }
+ list_for_each_entry(save_res, &save_head, list)
+ restore_resource(save_res, save_res->res);
+
free_list(&save_head);
requested_and_reassign:
@@ -1911,9 +1926,7 @@ again:
list_for_each_entry(fail_res, &fail_head, list) {
struct resource *res = fail_res->res;
- res->start = fail_res->start;
- res->end = fail_res->end;
- res->flags = fail_res->flags;
+ restore_resource(fail_res, res);
if (fail_res->dev->subordinate)
res->flags = 0;
}
@@ -1977,9 +1990,7 @@ again:
list_for_each_entry(fail_res, &fail_head, list) {
struct resource *res = fail_res->res;
- res->start = fail_res->start;
- res->end = fail_res->end;
- res->flags = fail_res->flags;
+ restore_resource(fail_res, res);
if (fail_res->dev->subordinate)
res->flags = 0;
}
--
1.8.4.5
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
