Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[mirror_ubuntu-artful-kernel.git] / arch / x86 / kernel / apic / io_apic.c

diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index 7c4f90dd4c2ad3ffb441faaba224212e1b10d09c..f072b95726346e68e5a195ae95cf7d503c4267f7 100644 (file)
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -2568,29 +2568,25 @@ static struct resource * __init ioapic_setup_resources(void)
        unsigned long n;
        struct resource *res;
        char *mem;
-       int i, num = 0;
+       int i;
 
-       for_each_ioapic(i)
-               num++;
-       if (num == 0)
+       if (nr_ioapics == 0)
                return NULL;
 
        n = IOAPIC_RESOURCE_NAME_SIZE + sizeof(struct resource);
-       n *= num;
+       n *= nr_ioapics;
 
        mem = alloc_bootmem(n);
        res = (void *)mem;
 
-       mem += sizeof(struct resource) * num;
+       mem += sizeof(struct resource) * nr_ioapics;
 
-       num = 0;
        for_each_ioapic(i) {
-               res[num].name = mem;
-               res[num].flags = IORESOURCE_MEM | IORESOURCE_BUSY;
+               res[i].name = mem;
+               res[i].flags = IORESOURCE_MEM | IORESOURCE_BUSY;
                snprintf(mem, IOAPIC_RESOURCE_NAME_SIZE, "IOAPIC %u", i);
                mem += IOAPIC_RESOURCE_NAME_SIZE;
-               ioapics[i].iomem_res = &res[num];
-               num++;
+               ioapics[i].iomem_res = &res[i];
        }
 
        ioapic_resources = res;