From 72a29e9cf3491ed77385f9422e0837e503b5c6fc Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yinghai@kernel.org>
Date: Sat, 21 Jan 2012 02:08:32 -0800
Subject: [PATCH] --- yaml --- r: 294709 b: refs/heads/master c:
 67cc7e26a5c46508ee00b9fe169aad833b798025 h: refs/heads/master i:   294707:
 f1b4b807b25c5e161fd2632814e7bd1b2a02fa98 v: v3

---
 [refs]                        |  2 +-
 trunk/drivers/pci/setup-bus.c | 14 ++++----------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 4d60506edd02..61adf519e0c8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b592443d9045f0880eb4d8cc9125075744db4b9e
+refs/heads/master: 67cc7e26a5c46508ee00b9fe169aad833b798025
diff --git a/trunk/drivers/pci/setup-bus.c b/trunk/drivers/pci/setup-bus.c
index ae0b1f2c9e0a..090217afb4e1 100644
--- a/trunk/drivers/pci/setup-bus.c
+++ b/trunk/drivers/pci/setup-bus.c
@@ -89,14 +89,6 @@ static int add_to_list(struct list_head *head,
 	return 0;
 }
 
-static void add_to_failed_list(struct list_head *head,
-				struct pci_dev *dev, struct resource *res)
-{
-	add_to_list(head, dev, res,
-			0 /* dont care */,
-			0 /* dont care */);
-}
-
 static void remove_from_list(struct list_head *head,
 				 struct resource *res)
 {
@@ -302,8 +294,10 @@ static void assign_requested_resources_sorted(struct list_head *head,
 				 */
 				if (!((idx == PCI_ROM_RESOURCE) &&
 				      (!(res->flags & IORESOURCE_ROM_ENABLE))))
-					add_to_failed_list(fail_head,
-							   dev_res->dev, res);
+					add_to_list(fail_head,
+						    dev_res->dev, res,
+						    0 /* dont care */,
+						    0 /* dont care */);
 			}
 			reset_resource(res);
 		}