Commit b9629b82 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Andi Kleen
Browse files

[PATCH] i386: replace intermediate array-size definitions with ARRAY_SIZE() 



Code is easier to validate if array sizes aren't hidden behind extra
#defines.

Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
parent 29cbc78b

arch/i386/kernel/setup.c

+2 −8
Original line number Diff line number Diff line
@@ -209,9 +209,6 @@ static struct resource adapter_rom_resources[] = { { 
	.flags	= IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM

} };



#define ADAPTER_ROM_RESOURCES \

	(sizeof adapter_rom_resources / sizeof adapter_rom_resources[0])



static struct resource video_rom_resource = {

	.name 	= "Video ROM",

	.start	= 0xc0000,
@@ -273,9 +270,6 @@ static struct resource standard_io_resources[] = { { 
	.flags	= IORESOURCE_BUSY | IORESOURCE_IO

} };



#define STANDARD_IO_RESOURCES \

	(sizeof standard_io_resources / sizeof standard_io_resources[0])



#define romsignature(x) (*(unsigned short *)(x) == 0xaa55)



static int __init romchecksum(unsigned char *rom, unsigned long length)
@@ -332,7 +326,7 @@ static void __init probe_roms(void) 
	}



	/* check for adapter roms on 2k boundaries */

	for (i = 0; i < ADAPTER_ROM_RESOURCES && start < upper; start += 2048) {

	for (i = 0; i < ARRAY_SIZE(adapter_rom_resources) && start < upper; start += 2048) {

		rom = isa_bus_to_virt(start);

		if (!romsignature(rom))

			continue;
@@ -1272,7 +1266,7 @@ static int __init request_standard_resources(void) 
	request_resource(&iomem_resource, &video_ram_resource);



	/* request I/O space for devices used on all i[345]86 PCs */

	for (i = 0; i < STANDARD_IO_RESOURCES; i++)

	for (i = 0; i < ARRAY_SIZE(standard_io_resources); i++)

		request_resource(&ioport_resource, &standard_io_resources[i]);

	return 0;

}