From: Ram Pai <linuxram@us.ibm.com>
To: linux-pci@vger.kernel.org, jbarnes@virtuousgeek.org
Cc: Ram Pai <linuxram@us.ibm.com>,
linux-kernel@vger.kernel.org, clemens@ladisch.de,
Yinghai Lu <yinghai@kernel.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
Bjorn Helgaas <bjorn.helgaas@hp.com>
Subject: [PATCH 2/4] PCI: data structure agnostic free list function
Date: Mon, 14 Feb 2011 17:43:18 -0800 [thread overview]
Message-ID: <1297734200-23327-3-git-send-email-linuxram@us.ibm.com> (raw)
In-Reply-To: <1297734200-23327-1-git-send-email-linuxram@us.ibm.com>
replaced 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>
---
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 2121215..bcf5752 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -36,6 +36,16 @@ struct resource_list_x {
unsigned long flags;
};
+#define free_list(type, head) do { \
+ struct type *list, *tmp; \
+ for (list = (head)->next; list;) { \
+ tmp = list; \
+ list = list->next; \
+ kfree(tmp); \
+ } \
+ (head)->next = NULL; \
+} while (0)
+
static void add_to_failed_list(struct resource_list_x *head,
struct pci_dev *dev, struct resource *res)
{
@@ -58,19 +68,6 @@ static void add_to_failed_list(struct resource_list_x *head,
list->next = tmp;
}
-static void free_failed_list(struct resource_list_x *head)
-{
- struct resource_list_x *list, *tmp;
-
- for (list = head->next; list;) {
- tmp = list;
- list = list->next;
- kfree(tmp);
- }
-
- head->next = NULL;
-}
-
static void __dev_sort_resources(struct pci_dev *dev,
struct resource_list *head)
{
@@ -900,7 +897,7 @@ again:
if (tried_times >= 2) {
/* still fail, don't need to try more */
- free_failed_list(&head);
+ free_list(resource_list_x, &head);
goto enable_all;
}
@@ -931,7 +928,7 @@ again:
list = list->next;
}
- free_failed_list(&head);
+ free_list(resource_list_x, &head);
goto again;
--
1.6.5.2
next prev parent reply other threads:[~2011-02-15 1:43 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-15 1:43 [PATCH 0/4] PCI: preallocate resource patch series Ram Pai
2011-02-15 1:43 ` [PATCH 1/4] PCI: refactor io size calculation code Ram Pai
2011-02-15 1:43 ` Ram Pai [this message]
2011-02-15 1:43 ` [PATCH 3/4] PCI: introduce reset_resource() Ram Pai
2011-02-25 22:56 ` Jesse Barnes
2011-02-15 1:43 ` [PATCH 4/4] PCI: pre-allocate additional resources to devices only after successful allocation of essential resources Ram Pai
2011-03-04 18:47 ` Jesse Barnes
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1297734200-23327-3-git-send-email-linuxram@us.ibm.com \
--to=linuxram@us.ibm.com \
--cc=bjorn.helgaas@hp.com \
--cc=clemens@ladisch.de \
--cc=jbarnes@virtuousgeek.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=yinghai@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.