4 files changed, 8 insertions, 8 deletions
diff --git a/src/mainboard/supermicro/h8qgi/BiosCallOuts.c b/src/mainboard/supermicro/h8qgi/BiosCallOuts.c
index b7f0124034..7c9c7bd321 100644
--- a/src/mainboard/supermicro/h8qgi/BiosCallOuts.c
+++ b/src/mainboard/supermicro/h8qgi/BiosCallOuts.c
@@ -24,7 +24,7 @@
 #include "OptionsIds.h"
 #include "heapManager.h"
 
-STATIC BIOS_CALLOUT_STRUCT BiosCallouts[REQUIRED_CALLOUTS] =
+STATIC BIOS_CALLOUT_STRUCT BiosCallouts[] =
 {
 	{
 		AGESA_ALLOCATE_BUFFER,
@@ -87,14 +87,15 @@ AGESA_STATUS GetBiosCallout (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
 {
 	UINTN i;
 	AGESA_STATUS CalloutStatus;
+	UINTN CallOutCount = sizeof (BiosCallouts) / sizeof (BiosCallouts [0]);
 
-	for (i = 0; i < REQUIRED_CALLOUTS; i++) {
+	for (i = 0; i < CallOutCount; i++) {
 		if (BiosCallouts[i].CalloutName == Func) {
 			break;
 		}
 	}
 
-	if(i >= REQUIRED_CALLOUTS) {
+	if(i >= CallOutCount) {
 		return AGESA_UNSUPPORTED;
 	}
 
diff --git a/src/mainboard/supermicro/h8qgi/BiosCallOuts.h b/src/mainboard/supermicro/h8qgi/BiosCallOuts.h
index 24a05fb868..88eddc5f75 100644
--- a/src/mainboard/supermicro/h8qgi/BiosCallOuts.h
+++ b/src/mainboard/supermicro/h8qgi/BiosCallOuts.h
@@ -23,7 +23,6 @@
 #include "Porting.h"
 #include "AGESA.h"
 
-#define REQUIRED_CALLOUTS		12
 #define BIOS_HEAP_START_ADDRESS		0x00010000
 #define BIOS_HEAP_SIZE			0x20000   /* 64MB */
 
diff --git a/src/mainboard/supermicro/h8scm/BiosCallOuts.c b/src/mainboard/supermicro/h8scm/BiosCallOuts.c
index b7f0124034..7c9c7bd321 100644
--- a/src/mainboard/supermicro/h8scm/BiosCallOuts.c
+++ b/src/mainboard/supermicro/h8scm/BiosCallOuts.c
@@ -24,7 +24,7 @@
 #include "OptionsIds.h"
 #include "heapManager.h"
 
-STATIC BIOS_CALLOUT_STRUCT BiosCallouts[REQUIRED_CALLOUTS] =
+STATIC BIOS_CALLOUT_STRUCT BiosCallouts[] =
 {
 	{
 		AGESA_ALLOCATE_BUFFER,
@@ -87,14 +87,15 @@ AGESA_STATUS GetBiosCallout (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
 {
 	UINTN i;
 	AGESA_STATUS CalloutStatus;
+	UINTN CallOutCount = sizeof (BiosCallouts) / sizeof (BiosCallouts [0]);
 
-	for (i = 0; i < REQUIRED_CALLOUTS; i++) {
+	for (i = 0; i < CallOutCount; i++) {
 		if (BiosCallouts[i].CalloutName == Func) {
 			break;
 		}
 	}
 
-	if(i >= REQUIRED_CALLOUTS) {
+	if(i >= CallOutCount) {
 		return AGESA_UNSUPPORTED;
 	}
 
diff --git a/src/mainboard/supermicro/h8scm/BiosCallOuts.h b/src/mainboard/supermicro/h8scm/BiosCallOuts.h
index c52417401e..834374881d 100644
--- a/src/mainboard/supermicro/h8scm/BiosCallOuts.h
+++ b/src/mainboard/supermicro/h8scm/BiosCallOuts.h
@@ -23,7 +23,6 @@
 #include "Porting.h"
 #include "AGESA.h"
 
-#define REQUIRED_CALLOUTS		12
 #define BIOS_HEAP_START_ADDRESS		0x00010000
 #define BIOS_HEAP_SIZE			0x20000   /* 64MB */