Commit 9d0ef4fd authored by Andi Kleen's avatar Andi Kleen Committed by Andi Kleen
Browse files

[PATCH] Use ARRAY_SIZE in setup.c 



Based on i386 patch from Bjorn.

Signed-off-by: default avatarAndi Kleen <ak@suse.de>
parent b9629b82

arch/x86_64/kernel/setup.c

+3 −8
Original line number Diff line number Diff line
@@ -123,9 +123,6 @@ struct resource standard_io_resources[] = { 
		.flags = IORESOURCE_BUSY | IORESOURCE_IO }

};



#define STANDARD_IO_RESOURCES \

	(sizeof standard_io_resources / sizeof standard_io_resources[0])



#define IORESOURCE_RAM (IORESOURCE_BUSY | IORESOURCE_MEM)



struct resource data_resource = {
@@ -172,9 +169,6 @@ static struct resource adapter_rom_resources[] = { 
		.flags = IORESOURCE_ROM }

};



#define ADAPTER_ROM_RESOURCES \

	(sizeof adapter_rom_resources / sizeof adapter_rom_resources[0])



static struct resource video_rom_resource = {

	.name = "Video ROM",

	.start = 0xc0000,
@@ -245,7 +239,8 @@ 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;
@@ -537,7 +532,7 @@ void __init setup_arch(char **cmdline_p) 
	{

	unsigned i;

	/* 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]);

	}