From: Milind Arun Choudhary ROUND_UP macro cleanup, use ALIGN where ever appropriate. Signed-off-by: Milind Arun Choudhary Acked-by: Paul Mundt Signed-off-by: Andrew Morton --- arch/sh64/kernel/pci_sh5.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff -puN arch/sh64/kernel/pci_sh5.c~round_up-macro-cleanup-in-arch-sh64-kernel-pci_sh5c arch/sh64/kernel/pci_sh5.c --- a/arch/sh64/kernel/pci_sh5.c~round_up-macro-cleanup-in-arch-sh64-kernel-pci_sh5c +++ a/arch/sh64/kernel/pci_sh5.c @@ -376,8 +376,6 @@ irqreturn_t pcish5_serr_irq(int irq, voi return IRQ_NONE; } -#define ROUND_UP(x, a) (((x) + (a) - 1) & ~((a) - 1)) - static void __init pcibios_size_bridge(struct pci_bus *bus, struct resource *ior, struct resource *memr) @@ -434,8 +432,8 @@ pcibios_size_bridge(struct pci_bus *bus, mem_res.end -= mem_res.start; /* Align the sizes up by bridge rules */ - io_res.end = ROUND_UP(io_res.end, 4*1024) - 1; - mem_res.end = ROUND_UP(mem_res.end, 1*1024*1024) - 1; + io_res.end = ALIGN(io_res.end, 4*1024) - 1; + mem_res.end = ALIGN(mem_res.end, 1*1024*1024) - 1; /* Adjust the bridge's allocation requirements */ bridge->resource[0].end = bridge->resource[0].start + io_res.end; @@ -448,18 +446,16 @@ pcibios_size_bridge(struct pci_bus *bus, /* adjust parent's resource requirements */ if (ior) { - ior->end = ROUND_UP(ior->end, 4*1024); + ior->end = ALIGN(ior->end, 4*1024); ior->end += io_res.end; } if (memr) { - memr->end = ROUND_UP(memr->end, 1*1024*1024); + memr->end = ALIGN(memr->end, 1*1024*1024); memr->end += mem_res.end; } } -#undef ROUND_UP - static void __init pcibios_size_bridges(void) { struct resource io_res, mem_res; _