fixed compilation

[psensor.git] / src / lib / amd.c

diff --git a/src/lib/amd.c b/src/lib/amd.c
index 0cc2b35..9d0f51f 100644 (file)
--- a/src/lib/amd.c
+++ b/src/lib/amd.c
@@ -69,19 +69,18 @@ static void *getprocaddress(void *plibrary, const char *name)
        return dlsym(plibrary, name);
 }
 
-/*
-  Returns the temperature (Celcius) of an AMD/ATI GPU.
-*/
+/* Returns the temperature (Celsius) of an AMD/ATI GPU. */
 static double get_temp(struct psensor *sensor)
 {
        ADLTemperature v;
 
        v.iSize = sizeof(ADLTemperature);
        v.iTemperature = -273;
+
        if (ADL_OK == adl_od5_temperature_get(sensor->amd_id, 0, &v))
                return v.iTemperature/1000;
-       else
-               return UNKNOWN_DBL_VALUE;
+
+       return UNKNOWN_DBL_VALUE;
 }
 
 static double get_fanspeed(struct psensor *sensor)
@@ -91,10 +90,11 @@ static double get_fanspeed(struct psensor *sensor)
        v.iSize = sizeof(ADLFanSpeedValue);
        v.iSpeedType = ADL_DL_FANCTRL_SPEED_TYPE_RPM;
        v.iFanSpeed = -1;
+
        if (ADL_OK == adl_od5_fanspeed_get(sensor->amd_id, 0, &v))
                return v.iFanSpeed;
-       else
-               return UNKNOWN_DBL_VALUE;
+
+       return UNKNOWN_DBL_VALUE;
 }
 
 static double get_usage(struct psensor *sensor)
@@ -102,10 +102,11 @@ static double get_usage(struct psensor *sensor)
        ADLPMActivity v;
 
        v.iSize = sizeof(ADLPMActivity);
+
        if (ADL_OK == adl_od5_currentactivity_get(sensor->amd_id, &v))
                return v.iActivityPercent;
-       else
-               return UNKNOWN_DBL_VALUE;
+
+       return UNKNOWN_DBL_VALUE;
 }
 
 static struct psensor *create_sensor(int id, int type, int values_len)
@@ -132,7 +133,7 @@ static struct psensor *create_sensor(int id, int type, int values_len)
        /* GPU Usage (Activity/Load %) */
        case 2:
                sprintf(name, "AMD GPU%d Usage", id);
-               sensor_type |= SENSOR_TYPE_GPU | SENSOR_TYPE_USAGE;
+               sensor_type |= SENSOR_TYPE_GPU | SENSOR_TYPE_PERCENT;
                break;
        }
 
@@ -270,7 +271,7 @@ void amd_psensor_list_update(struct psensor **sensors)
                                psensor_set_current_value(s, get_temp(s));
                        else if (s->type & SENSOR_TYPE_RPM)
                                psensor_set_current_value(s, get_fanspeed(s));
-                       else if (s->type & SENSOR_TYPE_USAGE)
+                       else if (s->type & SENSOR_TYPE_PERCENT)
                                psensor_set_current_value(s, get_usage(s));
                }