AMD binaryPI BiosCallouts: Remove cast

This cast only hides errors in matching the API properly.

Change-Id: I9b878ab997b8ff087a7209f94522646b10b94bf6
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/12271
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>

2 files changed, 14 insertions, 14 deletions

diff --git a/src/northbridge/amd/pi/BiosCallOuts.h b/src/northbridge/amd/pi/BiosCallOuts.h
index 1525839b9b..b05d5077a5 100644
--- a/src/northbridge/amd/pi/BiosCallOuts.h
+++ b/src/northbridge/amd/pi/BiosCallOuts.h
@@ -57,7 +57,7 @@ AGESA_STATUS GetBiosCallout (UINT32 Func, UINT32 Data, VOID *ConfigPtr);
 
 typedef struct {
 	UINT32 CalloutName;
-	AGESA_STATUS (*CalloutPtr) (UINT32 Func, UINT32 Data, VOID* ConfigPtr);
+	CALLOUT_ENTRY CalloutPtr;
 } BIOS_CALLOUT_STRUCT;
 
 extern const BIOS_CALLOUT_STRUCT BiosCallouts[];
diff --git a/src/northbridge/amd/pi/agesawrapper.c b/src/northbridge/amd/pi/agesawrapper.c
index 5772fb4872..ec435399ee 100644
--- a/src/northbridge/amd/pi/agesawrapper.c
+++ b/src/northbridge/amd/pi/agesawrapper.c
@@ -63,7 +63,7 @@ AGESA_STATUS agesawrapper_amdinitreset(void)
 	AmdParamStruct.NewStructSize = sizeof(AMD_RESET_PARAMS);
 	AmdParamStruct.NewStructPtr = &AmdResetParams;
 	AmdParamStruct.StdHeader.AltImageBasePtr = 0;
-	AmdParamStruct.StdHeader.CalloutPtr = (CALLOUT_ENTRY) &GetBiosCallout;
+	AmdParamStruct.StdHeader.CalloutPtr = &GetBiosCallout;
 	AmdParamStruct.StdHeader.Func = 0;
 	AmdParamStruct.StdHeader.ImageBasePtr = 0;
 	AmdCreateStruct (&AmdParamStruct);
@@ -95,7 +95,7 @@ AGESA_STATUS agesawrapper_amdinitearly(void)
 	AmdParamStruct.AgesaFunctionName = AMD_INIT_EARLY;
 	AmdParamStruct.AllocationMethod = PreMemHeap;
 	AmdParamStruct.StdHeader.AltImageBasePtr = 0;
-	AmdParamStruct.StdHeader.CalloutPtr = (CALLOUT_ENTRY) &GetBiosCallout;
+	AmdParamStruct.StdHeader.CalloutPtr = &GetBiosCallout;
 	AmdParamStruct.StdHeader.Func = 0;
 	AmdParamStruct.StdHeader.ImageBasePtr = 0;
 	AmdCreateStruct (&AmdParamStruct);
@@ -125,7 +125,7 @@ AGESA_STATUS agesawrapper_amdinitpost(void)
 	AmdParamStruct.AgesaFunctionName = AMD_INIT_POST;
 	AmdParamStruct.AllocationMethod = PreMemHeap;
 	AmdParamStruct.StdHeader.AltImageBasePtr = NULL;
-	AmdParamStruct.StdHeader.CalloutPtr = (CALLOUT_ENTRY) &GetBiosCallout;
+	AmdParamStruct.StdHeader.CalloutPtr = &GetBiosCallout;
 	AmdParamStruct.StdHeader.Func = 0;
 	AmdParamStruct.StdHeader.ImageBasePtr = 0;
 
@@ -181,7 +181,7 @@ AGESA_STATUS agesawrapper_amdinitenv(void)
 	AmdParamStruct.AgesaFunctionName = AMD_INIT_ENV;
 	AmdParamStruct.AllocationMethod = PostMemDram;
 	AmdParamStruct.StdHeader.AltImageBasePtr = 0;
-	AmdParamStruct.StdHeader.CalloutPtr = (CALLOUT_ENTRY) &GetBiosCallout;
+	AmdParamStruct.StdHeader.CalloutPtr = &GetBiosCallout;
 	AmdParamStruct.StdHeader.Func = 0;
 	AmdParamStruct.StdHeader.ImageBasePtr = 0;
 	status = AmdCreateStruct (&AmdParamStruct);
@@ -249,7 +249,7 @@ AGESA_STATUS agesawrapper_amdinitmid(void)
 	AmdParamStruct.AgesaFunctionName = AMD_INIT_MID;
 	AmdParamStruct.AllocationMethod = PostMemDram;
 	AmdParamStruct.StdHeader.AltImageBasePtr = 0;
-	AmdParamStruct.StdHeader.CalloutPtr = (CALLOUT_ENTRY) &GetBiosCallout;
+	AmdParamStruct.StdHeader.CalloutPtr = &GetBiosCallout;
 	AmdParamStruct.StdHeader.Func = 0;
 	AmdParamStruct.StdHeader.ImageBasePtr = 0;
 
@@ -287,7 +287,7 @@ AGESA_STATUS agesawrapper_amdinitlate(void)
 	AmdParamStruct.AgesaFunctionName = AMD_INIT_LATE;
 	AmdParamStruct.AllocationMethod = PostMemDram;
 	AmdParamStruct.StdHeader.AltImageBasePtr = 0;
-	AmdParamStruct.StdHeader.CalloutPtr = (CALLOUT_ENTRY) &GetBiosCallout;
+	AmdParamStruct.StdHeader.CalloutPtr = &GetBiosCallout;
 	AmdParamStruct.StdHeader.HeapStatus = HEAP_SYSTEM_MEM;
 	AmdParamStruct.StdHeader.Func = 0;
 	AmdParamStruct.StdHeader.ImageBasePtr = 0;
@@ -341,7 +341,7 @@ AGESA_STATUS agesawrapper_amdlaterunaptask (
 		       &(ApExeParams.StdHeader));
 
 	ApExeParams.StdHeader.AltImageBasePtr = 0;
-	ApExeParams.StdHeader.CalloutPtr = (CALLOUT_ENTRY) &GetBiosCallout;
+	ApExeParams.StdHeader.CalloutPtr = &GetBiosCallout;
 	ApExeParams.StdHeader.Func = 0;
 	ApExeParams.StdHeader.ImageBasePtr = 0;
 	ApExeParams.FunctionNumber = Func;
@@ -373,7 +373,7 @@ AGESA_STATUS agesawrapper_amdinitresume(void)
 	AmdParamStruct.AgesaFunctionName = AMD_INIT_RESUME;
 	AmdParamStruct.AllocationMethod = PreMemHeap;
 	AmdParamStruct.StdHeader.AltImageBasePtr = 0;
-	AmdParamStruct.StdHeader.CalloutPtr = (CALLOUT_ENTRY) &GetBiosCallout;
+	AmdParamStruct.StdHeader.CalloutPtr = &GetBiosCallout;
 	AmdParamStruct.StdHeader.Func = 0;
 	AmdParamStruct.StdHeader.ImageBasePtr = 0;
 	AmdCreateStruct (&AmdParamStruct);
@@ -406,7 +406,7 @@ AGESA_STATUS agesawrapper_fchs3earlyrestore(void)
 	StdHeader.HeapStatus = HEAP_SYSTEM_MEM;
 	StdHeader.HeapBasePtr = GetHeapBase(&StdHeader) + 0x10;
 	StdHeader.AltImageBasePtr = 0;
-	StdHeader.CalloutPtr = (CALLOUT_ENTRY) &GetBiosCallout;
+	StdHeader.CalloutPtr = &GetBiosCallout;
 	StdHeader.Func = 0;
 	StdHeader.ImageBasePtr = 0;
 
@@ -441,7 +441,7 @@ AGESA_STATUS agesawrapper_amds3laterestore(void)
 	AmdInterfaceParams.AllocationMethod = ByHost;
 	AmdInterfaceParams.AgesaFunctionName = AMD_S3LATE_RESTORE;
 	AmdInterfaceParams.NewStructPtr = &AmdS3LateParams;
-	AmdInterfaceParams.StdHeader.CalloutPtr = (CALLOUT_ENTRY) &GetBiosCallout;
+	AmdInterfaceParams.StdHeader.CalloutPtr = &GetBiosCallout;
 	AmdS3LateParamsPtr = &AmdS3LateParams;
 	AmdInterfaceParams.NewStructSize = sizeof (AMD_S3LATE_PARAMS);
 
@@ -475,7 +475,7 @@ AGESA_STATUS agesawrapper_fchs3laterestore(void)
 	StdHeader.HeapStatus = HEAP_SYSTEM_MEM;
 	StdHeader.HeapBasePtr = GetHeapBase(&StdHeader) + 0x10;
 	StdHeader.AltImageBasePtr = 0;
-	StdHeader.CalloutPtr = (CALLOUT_ENTRY) &GetBiosCallout;
+	StdHeader.CalloutPtr = &GetBiosCallout;
 	StdHeader.Func = 0;
 	StdHeader.ImageBasePtr = 0;
 
@@ -517,7 +517,7 @@ AGESA_STATUS agesawrapper_amdS3Save(void)
 
 	AmdInterfaceParams.StdHeader.ImageBasePtr = 0;
 	AmdInterfaceParams.StdHeader.HeapStatus = HEAP_SYSTEM_MEM;
-	AmdInterfaceParams.StdHeader.CalloutPtr = (CALLOUT_ENTRY) &GetBiosCallout;
+	AmdInterfaceParams.StdHeader.CalloutPtr = &GetBiosCallout;
 	AmdInterfaceParams.AllocationMethod = PostMemDram;
 	AmdInterfaceParams.AgesaFunctionName = AMD_S3_SAVE;
 	AmdInterfaceParams.StdHeader.AltImageBasePtr = 0;
@@ -576,7 +576,7 @@ AGESA_STATUS agesawrapper_amdreadeventlog (UINT8 HeapStatus)
 		       &(AmdEventParams.StdHeader));
 
 	AmdEventParams.StdHeader.AltImageBasePtr = 0;
-	AmdEventParams.StdHeader.CalloutPtr = (CALLOUT_ENTRY) &GetBiosCallout;
+	AmdEventParams.StdHeader.CalloutPtr = &GetBiosCallout;
 	AmdEventParams.StdHeader.Func = 0;
 	AmdEventParams.StdHeader.ImageBasePtr = 0;
 	AmdEventParams.StdHeader.HeapStatus = HeapStatus;