control: Extract bus object from config argument pack
All configured objects require a reference to the sdbusplus bus object
except Group objects, so instead of pass the reference twice to the
get the configured objects, extract the bus from the argument pack.
Change-Id: I4859f513863bd62999a9db7610d5955fc8116cb3
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
diff --git a/control/json/manager.cpp b/control/json/manager.cpp
index 3457d3c..2365a7d 100644
--- a/control/json/manager.cpp
+++ b/control/json/manager.cpp
@@ -68,10 +68,10 @@
setProfiles();
// Load the zone configurations
- _zones = getConfig<Zone>(false, bus, bus, event, this);
+ _zones = getConfig<Zone>(false, bus, event, this);
// Load the fan configurations and move each fan into its zone
- auto fans = getConfig<Fan>(false, bus, bus);
+ auto fans = getConfig<Fan>(false, bus);
for (auto& fan : fans)
{
configKey fanProfile =
@@ -96,7 +96,7 @@
auto groups = getConfig<Group>(true, bus);
// Load any events configured
- _events = getConfig<Event>(true, bus, bus, this, groups, _zones);
+ _events = getConfig<Event>(true, bus, this, groups, _zones);
bus.request_name(CONTROL_BUSNAME);
}