Remove OCC EREMOTEIO return code hack
With openbmc/openbmc#2329, an OCC sensor value will not be read when the
associated fault file is set to true. This will set the value to 0 when
a sensor is faulted at startup or not update the previous value during
the monitoring loop if the OCC sensor becomes faulted.
Applications(i.e. fan control) needing to react to a faulted OCC sensor
can subscribe to property changed signals on the OperationalStatus
Functional property for the sensor's dbus object.
Tested:
A faulted OCC sensor has a non-functional status on dbus
Change-Id: Ia43ebb1e0fe0227797bc4034e617ac357edd348d
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
diff --git a/mainloop.cpp b/mainloop.cpp
index 11b182e..bfc010e 100644
--- a/mainloop.cpp
+++ b/mainloop.cpp
@@ -135,8 +135,7 @@
auto addValue(const SensorSet::key_type& sensor,
const RetryIO& retryIO,
hwmonio::HwmonIO& ioAccess,
- ObjectInfo& info,
- bool isOCC = false)
+ ObjectInfo& info)
{
static constexpr bool deferSignals = true;
@@ -181,8 +180,7 @@
sensor.second,
hwmon::entry::cinput,
std::get<size_t>(retryIO),
- std::get<std::chrono::milliseconds>(retryIO),
- isOCC);
+ std::get<std::chrono::milliseconds>(retryIO));
val = adjustValue(sensor, val);
}
@@ -307,8 +305,7 @@
{
// Add status interface based on _fault file being present
sensor::addStatus(sensor.first, ioAccess, _devPath, info);
- valueInterface = addValue(sensor.first, retryIO, ioAccess, info,
- _isOCC);
+ valueInterface = addValue(sensor.first, retryIO, ioAccess, info);
}
catch (const std::system_error& e)
{
@@ -397,11 +394,6 @@
state(),
ioAccess(path)
{
- if (path.find("occ") != std::string::npos)
- {
- _isOCC = true;
- }
-
// Strip off any trailing slashes.
std::string p = path;
while (!p.empty() && p.back() == '/')
@@ -554,8 +546,7 @@
i.first.second,
input,
hwmonio::retries,
- hwmonio::delay,
- _isOCC);
+ hwmonio::delay);
value = adjustValue(i.first, value);