diff options
author | Ram Pai <linuxram@us.ibm.com> | 2011-02-14 20:43:18 -0500 |
---|---|---|
committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2011-03-04 13:46:04 -0500 |
commit | 094732a520caae81ae1532af29da82a4fa953472 (patch) | |
tree | 8c1b7ed35d86187032372b6e0db690c04b10a6bc /drivers/pci/setup-bus.c | |
parent | 13583b16592a9a85093dd9aa3d4e8cd76e4f0cd4 (diff) |
PCI: data structure agnostic free list function
Replace free_failed_list() with a free_list() call. free_list() can
handle 'resource_list_x', 'resource_list' and any linked list linked
through ->next
Signed-off-by: Ram Pai <linuxram@us.ibm.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers/pci/setup-bus.c')
-rw-r--r-- | drivers/pci/setup-bus.c | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index 21212155eaba..bcf5752f6907 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c | |||
@@ -36,6 +36,16 @@ struct resource_list_x { | |||
36 | unsigned long flags; | 36 | unsigned long flags; |
37 | }; | 37 | }; |
38 | 38 | ||
39 | #define free_list(type, head) do { \ | ||
40 | struct type *list, *tmp; \ | ||
41 | for (list = (head)->next; list;) { \ | ||
42 | tmp = list; \ | ||
43 | list = list->next; \ | ||
44 | kfree(tmp); \ | ||
45 | } \ | ||
46 | (head)->next = NULL; \ | ||
47 | } while (0) | ||
48 | |||
39 | static void add_to_failed_list(struct resource_list_x *head, | 49 | static void add_to_failed_list(struct resource_list_x *head, |
40 | struct pci_dev *dev, struct resource *res) | 50 | struct pci_dev *dev, struct resource *res) |
41 | { | 51 | { |
@@ -58,19 +68,6 @@ static void add_to_failed_list(struct resource_list_x *head, | |||
58 | list->next = tmp; | 68 | list->next = tmp; |
59 | } | 69 | } |
60 | 70 | ||
61 | static void free_failed_list(struct resource_list_x *head) | ||
62 | { | ||
63 | struct resource_list_x *list, *tmp; | ||
64 | |||
65 | for (list = head->next; list;) { | ||
66 | tmp = list; | ||
67 | list = list->next; | ||
68 | kfree(tmp); | ||
69 | } | ||
70 | |||
71 | head->next = NULL; | ||
72 | } | ||
73 | |||
74 | static void __dev_sort_resources(struct pci_dev *dev, | 71 | static void __dev_sort_resources(struct pci_dev *dev, |
75 | struct resource_list *head) | 72 | struct resource_list *head) |
76 | { | 73 | { |
@@ -900,7 +897,7 @@ again: | |||
900 | 897 | ||
901 | if (tried_times >= 2) { | 898 | if (tried_times >= 2) { |
902 | /* still fail, don't need to try more */ | 899 | /* still fail, don't need to try more */ |
903 | free_failed_list(&head); | 900 | free_list(resource_list_x, &head); |
904 | goto enable_all; | 901 | goto enable_all; |
905 | } | 902 | } |
906 | 903 | ||
@@ -931,7 +928,7 @@ again: | |||
931 | 928 | ||
932 | list = list->next; | 929 | list = list->next; |
933 | } | 930 | } |
934 | free_failed_list(&head); | 931 | free_list(resource_list_x, &head); |
935 | 932 | ||
936 | goto again; | 933 | goto again; |
937 | 934 | ||