Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[PATCH] Use ARRAY_SIZE in setup.c

Based on i386 patch from Bjorn.

Signed-off-by: Andi Kleen <ak@suse.de>

authored by

Andi Kleen and committed by
Andi Kleen
9d0ef4fd b9629b82

+3 -8
+3 -8
arch/x86_64/kernel/setup.c
··· 123 123 .flags = IORESOURCE_BUSY | IORESOURCE_IO } 124 124 }; 125 125 126 - #define STANDARD_IO_RESOURCES \ 127 - (sizeof standard_io_resources / sizeof standard_io_resources[0]) 128 - 129 126 #define IORESOURCE_RAM (IORESOURCE_BUSY | IORESOURCE_MEM) 130 127 131 128 struct resource data_resource = { ··· 168 171 { .name = "Adapter ROM", .start = 0, .end = 0, 169 172 .flags = IORESOURCE_ROM } 170 173 }; 171 - 172 - #define ADAPTER_ROM_RESOURCES \ 173 - (sizeof adapter_rom_resources / sizeof adapter_rom_resources[0]) 174 174 175 175 static struct resource video_rom_resource = { 176 176 .name = "Video ROM", ··· 239 245 } 240 246 241 247 /* check for adapter roms on 2k boundaries */ 242 - for (i = 0; i < ADAPTER_ROM_RESOURCES && start < upper; start += 2048) { 248 + for (i = 0; i < ARRAY_SIZE(adapter_rom_resources) && start < upper; 249 + start += 2048) { 243 250 rom = isa_bus_to_virt(start); 244 251 if (!romsignature(rom)) 245 252 continue; ··· 532 537 { 533 538 unsigned i; 534 539 /* request I/O space for devices used on all i[345]86 PCs */ 535 - for (i = 0; i < STANDARD_IO_RESOURCES; i++) 540 + for (i = 0; i < ARRAY_SIZE(standard_io_resources); i++) 536 541 request_resource(&ioport_resource, &standard_io_resources[i]); 537 542 } 538 543