aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/setup-bus.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/pci/setup-bus.c')
-rw-r--r--drivers/pci/setup-bus.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 5ec297d7a5b4..5e5191ec8de6 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -34,8 +34,6 @@
34#define DBG(x...) 34#define DBG(x...)
35#endif 35#endif
36 36
37#define ROUND_UP(x, a) (((x) + (a) - 1) & ~((a) - 1))
38
39static void pbus_assign_resources_sorted(struct pci_bus *bus) 37static void pbus_assign_resources_sorted(struct pci_bus *bus)
40{ 38{
41 struct pci_dev *dev; 39 struct pci_dev *dev;
@@ -310,7 +308,7 @@ static void pbus_size_io(struct pci_bus *bus)
310#if defined(CONFIG_ISA) || defined(CONFIG_EISA) 308#if defined(CONFIG_ISA) || defined(CONFIG_EISA)
311 size = (size & 0xff) + ((size & ~0xffUL) << 2); 309 size = (size & 0xff) + ((size & ~0xffUL) << 2);
312#endif 310#endif
313 size = ROUND_UP(size + size1, 4096); 311 size = ALIGN(size + size1, 4096);
314 if (!size) { 312 if (!size) {
315 b_res->flags = 0; 313 b_res->flags = 0;
316 return; 314 return;
@@ -378,11 +376,11 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask, unsigned long
378 376
379 if (!align) 377 if (!align)
380 min_align = align1; 378 min_align = align1;
381 else if (ROUND_UP(align + min_align, min_align) < align1) 379 else if (ALIGN(align + min_align, min_align) < align1)
382 min_align = align1 >> 1; 380 min_align = align1 >> 1;
383 align += aligns[order]; 381 align += aligns[order];
384 } 382 }
385 size = ROUND_UP(size, min_align); 383 size = ALIGN(size, min_align);
386 if (!size) { 384 if (!size) {
387 b_res->flags = 0; 385 b_res->flags = 0;
388 return 1; 386 return 1;