diff options
-rw-r--r-- | drivers/pci/setup-bus.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index ae0b1f2c9e0a..090217afb4e1 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c | |||
@@ -89,14 +89,6 @@ static int add_to_list(struct list_head *head, | |||
89 | return 0; | 89 | return 0; |
90 | } | 90 | } |
91 | 91 | ||
92 | static void add_to_failed_list(struct list_head *head, | ||
93 | struct pci_dev *dev, struct resource *res) | ||
94 | { | ||
95 | add_to_list(head, dev, res, | ||
96 | 0 /* dont care */, | ||
97 | 0 /* dont care */); | ||
98 | } | ||
99 | |||
100 | static void remove_from_list(struct list_head *head, | 92 | static void remove_from_list(struct list_head *head, |
101 | struct resource *res) | 93 | struct resource *res) |
102 | { | 94 | { |
@@ -302,8 +294,10 @@ static void assign_requested_resources_sorted(struct list_head *head, | |||
302 | */ | 294 | */ |
303 | if (!((idx == PCI_ROM_RESOURCE) && | 295 | if (!((idx == PCI_ROM_RESOURCE) && |
304 | (!(res->flags & IORESOURCE_ROM_ENABLE)))) | 296 | (!(res->flags & IORESOURCE_ROM_ENABLE)))) |
305 | add_to_failed_list(fail_head, | 297 | add_to_list(fail_head, |
306 | dev_res->dev, res); | 298 | dev_res->dev, res, |
299 | 0 /* dont care */, | ||
300 | 0 /* dont care */); | ||
307 | } | 301 | } |
308 | reset_resource(res); | 302 | reset_resource(res); |
309 | } | 303 | } |