drop entity YAML in favor of json provided file

Step 5 of moving from entity map from YAML to JSON drops support for a
built-in YAML mapping of the entity containers.

Tested: Not tested.  No platform upstream updates this YAML file in
their builds.
Signed-off-by: Patrick Venture <venture@google.com>
Change-Id: Ic2918f568f5a6f4a9f9135990889b3bb84a0c81d

1 files changed, 2 insertions, 12 deletions

diff --git a/entity_map_json.cpp b/entity_map_json.cpp
index c0b836c..7b4e0bf 100644
--- a/entity_map_json.cpp
+++ b/entity_map_json.cpp
@@ -13,8 +13,6 @@ namespace ipmi
 namespace sensor
 {
 
-extern const EntityInfoMap entities;
-
 EntityInfoMapContainer* EntityInfoMapContainer::getContainer()
 {
     static std::unique_ptr<EntityInfoMapContainer> instance;
@@ -25,16 +23,8 @@ EntityInfoMapContainer* EntityInfoMapContainer::getContainer()
          * the first thread to hit it would set it up.
          */
         EntityInfoMap builtEntityMap = buildEntityMapFromFile();
-        if (!builtEntityMap.empty())
-        {
-            instance = std::unique_ptr<EntityInfoMapContainer>(
-                new EntityInfoMapContainer(builtEntityMap));
-        }
-        else
-        {
-            instance = std::unique_ptr<EntityInfoMapContainer>(
-                new EntityInfoMapContainer(entities));
-        }
+        instance = std::unique_ptr<EntityInfoMapContainer>(
+            new EntityInfoMapContainer(builtEntityMap));
     }
 
     return instance.get();