Fix build warning generated by ICC and MSVC compilers.

[mirror_edk2.git] / OptionRomPkg / CirrusLogic5430Dxe / Edid.c

diff --git a/OptionRomPkg/CirrusLogic5430Dxe/Edid.c b/OptionRomPkg/CirrusLogic5430Dxe/Edid.c
index 4ef733b5092a6b0dbfb6d6f092c15c5156b4952f..fcbfc024103ecd7ba180f66d265d15568894b85b 100644 (file)
--- a/OptionRomPkg/CirrusLogic5430Dxe/Edid.c
+++ b/OptionRomPkg/CirrusLogic5430Dxe/Edid.c
@@ -105,7 +105,6 @@ EDID_TIMING mVbeEstablishedEdidTiming[] = {
   @retval EFI_SUCCESS\r
 \r
 **/\r
-STATIC\r
 EFI_STATUS\r
 ReadEdidData (\r
   CIRRUS_LOGIC_5430_PRIVATE_DATA     *Private,\r
@@ -113,13 +112,13 @@ ReadEdidData (
   UINTN                              *EdidSize\r
   )\r
 {\r
-  UINT8             Index;\r
+  UINTN             Index;\r
   UINT8             EdidData[EDID_BLOCK_SIZE * 2];\r
   UINT8             *ValidEdid;\r
   UINT64            Signature;\r
 \r
   for (Index = 0; Index < EDID_BLOCK_SIZE * 2; Index ++) {\r
-    I2cReadByte (Private->PciIo, 0xa0, Index, &EdidData[Index]);\r
+    I2cReadByte (Private->PciIo, 0xa0, (UINT8)Index, &EdidData[Index]);\r
   }\r
 \r
   //\r
@@ -164,7 +163,6 @@ ReadEdidData (
   @return The 32 bit unique key for search.\r
 \r
 **/\r
-STATIC\r
 UINT32\r
 CalculateEdidKey (\r
   EDID_TIMING       *EdidTiming\r
@@ -189,7 +187,6 @@ CalculateEdidKey (
   @retval FALSE                  Not found.\r
 \r
 **/\r
-STATIC\r
 BOOLEAN\r
 SearchEdidTiming (\r
   VALID_EDID_TIMING *ValidEdidTiming,\r
@@ -220,7 +217,6 @@ SearchEdidTiming (
   @retval FALSE                  The EDID data is invalid.\r
 \r
 **/\r
-STATIC\r
 BOOLEAN\r
 ParseEdidData (\r
   UINT8                         *EdidBuffer,\r
@@ -401,7 +397,7 @@ CirrusLogic5430VideoModeSetup (
     // If EDID Override data doesn't exist or EFI_EDID_OVERRIDE_DONT_OVERRIDE returned,\r
     // read EDID information through I2C Bus\r
     //\r
-    if (ReadEdidData (Private, &EdidDiscoveredDataBlock, &EdidDiscoveredDataSize) == EFI_SUCCESS) {;\r
+    if (ReadEdidData (Private, &EdidDiscoveredDataBlock, &EdidDiscoveredDataSize) == EFI_SUCCESS) {\r
       Private->EdidDiscovered.SizeOfEdid = (UINT32) EdidDiscoveredDataSize;\r
        Private->EdidDiscovered.Edid = (UINT8 *) AllocateCopyPool (\r
                                                           EdidDiscoveredDataSize,\r
@@ -513,7 +509,10 @@ CirrusLogic5430VideoModeSetup (
     Private->MaxMode = CIRRUS_LOGIC_5430_MODE_COUNT;\r
   }\r
 \r
-  FreePool (EdidOverrideDataBlock);\r
+  if (EdidOverrideDataBlock != NULL) {\r
+    FreePool (EdidOverrideDataBlock);\r
+  }\r
+\r
   return EFI_SUCCESS;\r
 \r
 Done:\r