2 files changed, 9 insertions, 9 deletions
diff --git a/src/vendorcode/intel/fsp1_0/ivybridge_bd82x6x/include/fsphob.h b/src/vendorcode/intel/fsp1_0/ivybridge_bd82x6x/include/fsphob.h
index 58409074bc..5d64e51ceb 100644
--- a/src/vendorcode/intel/fsp1_0/ivybridge_bd82x6x/include/fsphob.h
+++ b/src/vendorcode/intel/fsp1_0/ivybridge_bd82x6x/include/fsphob.h
@@ -313,7 +313,7 @@ typedef union {
 
 **/
 #define GET_HOB_TYPE(HobStart) \
-  ((*(EFI_HOB_GENERIC_HEADER **)&(HobStart))->HobType)
+	(((EFI_HOB_GENERIC_HEADER *)(HobStart))->HobType)
 
 /**
   Returns the length, in bytes, of a HOB.
@@ -327,7 +327,7 @@ typedef union {
 
 **/
 #define GET_HOB_LENGTH(HobStart) \
-  ((*(EFI_HOB_GENERIC_HEADER **)&(HobStart))->HobLength)
+	(((EFI_HOB_GENERIC_HEADER *)(HobStart))->HobLength)
 
 /**
   Returns a pointer to the next HOB in the HOB list.
@@ -341,7 +341,7 @@ typedef union {
 
 **/
 #define GET_NEXT_HOB(HobStart) \
-  (VOID *)(*(UINT8 **)&(HobStart) + GET_HOB_LENGTH (HobStart))
+	(VOID *)((UINT8 *)(HobStart) + GET_HOB_LENGTH(HobStart))
 
 /**
   Determines if a HOB is the last HOB in the HOB list.
@@ -356,7 +356,7 @@ typedef union {
   @retval FALSE      The HOB specified by HobStart is not the last HOB in the HOB list.
 
 **/
-#define END_OF_HOB_LIST(HobStart)  (GET_HOB_TYPE (HobStart) == (UINT16)EFI_HOB_TYPE_END_OF_HOB_LIST)
+#define END_OF_HOB_LIST(HobStart)  (GET_HOB_TYPE(HobStart) == (UINT16)EFI_HOB_TYPE_END_OF_HOB_LIST)
 
 /**
   Returns a pointer to data buffer from a HOB of type EFI_HOB_TYPE_GUID_EXTENSION.
@@ -370,7 +370,7 @@ typedef union {
 
 **/
 #define GET_GUID_HOB_DATA(HobStart) \
-  (VOID *)(*(UINT8 **)&(HobStart) + sizeof (EFI_HOB_GUID_TYPE))
+	(VOID *)((UINT8 *)(HobStart) + sizeof(EFI_HOB_GUID_TYPE))
 
 /**
   Returns the size of the data buffer from a HOB of type EFI_HOB_TYPE_GUID_EXTENSION.
@@ -383,7 +383,7 @@ typedef union {
   @return  The size of the data buffer.
 **/
 #define GET_GUID_HOB_DATA_SIZE(HobStart) \
-  (UINT16)(GET_HOB_LENGTH (HobStart) - sizeof (EFI_HOB_GUID_TYPE))
+	(UINT16)(GET_HOB_LENGTH(HobStart) - sizeof(EFI_HOB_GUID_TYPE))
 
 /**
   Returns the pointer to the HOB list.
diff --git a/src/vendorcode/intel/fsp1_0/ivybridge_bd82x6x/srx/fsphob.c b/src/vendorcode/intel/fsp1_0/ivybridge_bd82x6x/srx/fsphob.c
index 4214b3ae22..5a1c600a24 100644
--- a/src/vendorcode/intel/fsp1_0/ivybridge_bd82x6x/srx/fsphob.c
+++ b/src/vendorcode/intel/fsp1_0/ivybridge_bd82x6x/srx/fsphob.c
@@ -145,11 +145,11 @@ GetNextHob (
   //
   // Parse the HOB list until end of list or matching type is found.
   //
-  while (!END_OF_HOB_LIST (Hob)) {
+  while (!END_OF_HOB_LIST(Hob.Raw)) {
     if (Hob.Header->HobType == Type) {
       return Hob.Raw;
     }
-    Hob.Raw = GET_NEXT_HOB (Hob);
+    Hob.Raw = GET_NEXT_HOB(Hob.Raw);
   }
   return NULL;
 }
@@ -186,7 +186,7 @@ GetNextGuidHob (
     if (CompareGuid (Guid, &GuidHob.Guid->Name)) {
       break;
     }
-    GuidHob.Raw = GET_NEXT_HOB (GuidHob);
+    GuidHob.Raw = GET_NEXT_HOB(GuidHob.Raw);
   }
   return GuidHob.Raw;
 }