Commit 28f99bebf73931ecaa98545f1fae7e3cf8a288a7
2012-02-26T16:45:03
Use the return value of fan_autotune to set fan_optimal instead of passing it as a pointer.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45
diff --git a/adl.c b/adl.c
index 20fc835..7a4707e 100644
--- a/adl.c
+++ b/adl.c
@@ -978,7 +978,8 @@ static int set_powertune(int gpu, int iPercentage)
return ret;
}
-static void fan_autotune(int gpu, int temp, int fanpercent, int lasttemp, bool __maybe_unused *fan_optimal)
+/* Returns whether the fanspeed is optimal already or not */
+static bool fan_autotune(int gpu, int temp, int fanpercent, int lasttemp)
{
struct cgpu_info *cgpu = &gpus[gpu];
struct gpu_adl *ga = &cgpu->adl;
@@ -1019,10 +1020,11 @@ static void fan_autotune(int gpu, int temp, int fanpercent, int lasttemp, bool _
else if (newpercent < iMin)
newpercent = iMin;
if (newpercent != fanpercent) {
- *fan_optimal = false;
applog(LOG_INFO, "Setting GPU %d fan percentage to %d", gpu, newpercent);
set_fanspeed(gpu, newpercent);
+ return false;
}
+ return true;
}
void gpu_autotune(int gpu, enum dev_enable *denable)
@@ -1047,7 +1049,7 @@ void gpu_autotune(int gpu, enum dev_enable *denable)
if (temp && fanpercent >= 0 && ga->autofan) {
if (!ga->twin)
- fan_autotune(gpu, temp, fanpercent, ga->lasttemp, &fan_optimal);
+ fan_optimal = fan_autotune(gpu, temp, fanpercent, ga->lasttemp);
else if (ga->autofan && (ga->has_fanspeed || !ga->twin->autofan)) {
/* On linked GPUs, we autotune the fan only once, based
* on the highest temperature from either GPUs */
@@ -1065,7 +1067,7 @@ void gpu_autotune(int gpu, enum dev_enable *denable)
fan_gpu = gpu;
else
fan_gpu = ga->twin->gpu;
- fan_autotune(fan_gpu, hightemp, fanpercent, lasttemp, &fan_optimal);
+ fan_optimal = fan_autotune(fan_gpu, hightemp, fanpercent, lasttemp);
}
}