From 06ff7268f67d1345fd115fda0879d781eac2d6b1 Mon Sep 17 00:00:00 2001
From: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Date: Sat, 5 Jul 2014 15:24:50 +1000
Subject: AGESA: Fix error status code return type to enum from UINT32
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

AGESA correctly uses the enum AGESA_STATUS type whereas boards use a
mess of UINT32 typecasts.

Also no need to shout VOID. We are not that careful on changing
all cases of VOID->void or whitespace issues as these files will
get merged with follow-ups.

Change-Id: I16ccfcc73cda6b917c7ff5fd42ee2cd04e7dc0dd
Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/6182
Tested-by: build bot (Jenkins)
---
 src/mainboard/amd/torpedo/agesawrapper.c | 49 +++++++++++++-------------------
 src/mainboard/amd/torpedo/agesawrapper.h | 22 +++++++-------
 2 files changed, 31 insertions(+), 40 deletions(-)

(limited to 'src/mainboard/amd/torpedo')

diff --git a/src/mainboard/amd/torpedo/agesawrapper.c b/src/mainboard/amd/torpedo/agesawrapper.c
index 556c2a85e5..4088386e49 100644
--- a/src/mainboard/amd/torpedo/agesawrapper.c
+++ b/src/mainboard/amd/torpedo/agesawrapper.c
@@ -149,8 +149,7 @@ ClearAllSmiEnableInPmio (
   Mmio32 (SmiMmioAddr, 0xC4) = 0x0;
 }
 
-UINT32
-agesawrapper_amdinitcpuio (
+AGESA_STATUS agesawrapper_amdinitcpuio (
   VOID
   )
 {
@@ -195,11 +194,10 @@ agesawrapper_amdinitcpuio (
   PciData = 0x00000013;
   LibAmdPciWrite(AccessWidth32, PciAddress, &PciData, &StdHeader);
   Status = AGESA_SUCCESS;
-  return (UINT32)Status;
+  return Status;
 }
 
-UINT32
-agesawrapper_amdinitmmio (
+AGESA_STATUS agesawrapper_amdinitmmio (
   VOID
   )
 {
@@ -259,11 +257,10 @@ agesawrapper_amdinitmmio (
 //-  ClearAllSmiEnableInPmio ();
 
   Status = AGESA_SUCCESS;
-  return (UINT32)Status;
+  return Status;
 }
 
-UINT32
-agesawrapper_amdinitreset (
+AGESA_STATUS agesawrapper_amdinitreset (
   VOID
   )
 {
@@ -296,11 +293,10 @@ agesawrapper_amdinitreset (
   status = AmdInitReset ((AMD_RESET_PARAMS *)AmdParamStruct.NewStructPtr);
   if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
   AmdReleaseStruct (&AmdParamStruct);
-  return (UINT32)status;
+  return status;
  }
 
-UINT32
-agesawrapper_amdinitearly (
+AGESA_STATUS agesawrapper_amdinitearly (
   VOID
   )
 {
@@ -328,11 +324,10 @@ agesawrapper_amdinitearly (
   if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
   AmdReleaseStruct (&AmdParamStruct);
 
-  return (UINT32)status;
+  return status;
 }
 
-UINT32
-agesawrapper_amdinitpost (
+AGESA_STATUS agesawrapper_amdinitpost (
   VOID
   )
 {
@@ -359,11 +354,10 @@ agesawrapper_amdinitpost (
   /* Initialize heap space */
 	EmptyHeap();
 
-  return (UINT32)status;
+  return status;
 }
 
-UINT32
-agesawrapper_amdinitenv (
+AGESA_STATUS agesawrapper_amdinitenv (
   VOID
   )
 {
@@ -386,7 +380,7 @@ agesawrapper_amdinitenv (
   if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
   AmdReleaseStruct (&AmdParamStruct);
 
-  return (UINT32)status;
+  return status;
 }
 
 VOID *
@@ -417,8 +411,7 @@ agesawrapper_getlateinitptr (
   }
 }
 
-UINT32
-agesawrapper_amdinitmid (
+AGESA_STATUS agesawrapper_amdinitmid (
   VOID
   )
 {
@@ -446,11 +439,10 @@ agesawrapper_amdinitmid (
   if (status != AGESA_SUCCESS) agesawrapper_amdreadeventlog();
   AmdReleaseStruct (&AmdParamStruct);
 
-  return (UINT32)status;
+  return status;
 }
 
-UINT32
-agesawrapper_amdinitlate (
+AGESA_STATUS agesawrapper_amdinitlate (
   VOID
   )
 {
@@ -482,10 +474,10 @@ agesawrapper_amdinitlate (
   AcpiWheaCmc    = AmdLateParams.AcpiWheaCmc;
   AcpiAlib       = AmdLateParams.AcpiAlib;
 
-  return (UINT32)Status;
+  return Status;
 }
 
-UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
+AGESA_STATUS agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
 {
   AGESA_STATUS Status;
   AP_EXE_PARAMS ApExeParams;
@@ -506,11 +498,10 @@ UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr)
     ASSERT(Status == AGESA_SUCCESS);
   }
 
-  return (UINT32)Status;
+  return Status;
 }
 
-UINT32
-agesawrapper_amdreadeventlog (
+AGESA_STATUS agesawrapper_amdreadeventlog (
   VOID
   )
 {
@@ -534,5 +525,5 @@ agesawrapper_amdreadeventlog (
     Status = AmdReadEventLog (&AmdEventParams);
   }
 
-  return (UINT32)Status;
+  return Status;
 }
diff --git a/src/mainboard/amd/torpedo/agesawrapper.h b/src/mainboard/amd/torpedo/agesawrapper.h
index 5947b6b504..5ca4cfad85 100644
--- a/src/mainboard/amd/torpedo/agesawrapper.h
+++ b/src/mainboard/amd/torpedo/agesawrapper.h
@@ -82,18 +82,18 @@ enum {
 };
 
 
-UINT32 agesawrapper_amdinitreset (void);
-UINT32 agesawrapper_amdinitearly (void);
-UINT32 agesawrapper_amdinitenv (void);
-UINT32 agesawrapper_amdinitlate (void);
-UINT32 agesawrapper_amdinitpost (void);
-UINT32 agesawrapper_amdinitmid (void);
+AGESA_STATUS agesawrapper_amdinitreset(void);
+AGESA_STATUS agesawrapper_amdinitearly(void);
+AGESA_STATUS agesawrapper_amdinitenv(void);
+AGESA_STATUS agesawrapper_amdinitlate(void);
+AGESA_STATUS agesawrapper_amdinitpost(void);
+AGESA_STATUS agesawrapper_amdinitmid(void);
 
-UINT32 agesawrapper_amdreadeventlog (void);
-UINT32 agesawrapper_amdinitcpuio (void);
-UINT32 agesawrapper_amdinitmmio (void);
-UINT32 agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr);
+AGESA_STATUS agesawrapper_amdreadeventlog(void);
+AGESA_STATUS agesawrapper_amdinitcpuio(void);
+AGESA_STATUS agesawrapper_amdinitmmio(void);
+AGESA_STATUS agesawrapper_amdlaterunaptask (UINT32 Func, UINT32 Data, VOID *ConfigPtr);
 void *agesawrapper_getlateinitptr (int pick);
 
-static inline UINT32 agesawrapper_amdS3Save(void) { return 0; }
+static inline AGESA_STATUS agesawrapper_amdS3Save(void) { return 0; }
 #endif
-- 
cgit v1.2.3