Commit 4a01c1314e52bb4234824d299487586d0097cb17
2014-07-28T12:31:40
Demote some ava2 messages that don't need to be errors and remove unused works array
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 46 47 48
diff --git a/driver-avalon2.c b/driver-avalon2.c
index e6400ec..a825c7f 100644
--- a/driver-avalon2.c
+++ b/driver-avalon2.c
@@ -308,7 +308,7 @@ static int decode_pkg(struct thr_info *thr, struct avalon2_ret *ar, uint8_t *pkg
real_pool = pool = pools[pool_no];
if (job_idcmp(job_id, pool->swork.job_id)) {
if (!job_idcmp(job_id, pool_stratum.swork.job_id)) {
- applog(LOG_ERR, "Avalon2: Match to previous stratum! (%s)", pool_stratum.swork.job_id);
+ applog(LOG_DEBUG, "Avalon2: Match to previous stratum! (%s)", pool_stratum.swork.job_id);
pool = &pool_stratum;
} else {
applog(LOG_ERR, "Avalon2: Cannot match to any stratum! (%s)", pool->swork.job_id);
@@ -710,11 +710,6 @@ static bool avalon2_prepare(struct thr_info *thr)
struct cgpu_info *avalon2 = thr->cgpu;
struct avalon2_info *info = avalon2->device_data;
- free(avalon2->works);
- avalon2->works = calloc(sizeof(struct work *), 2);
- if (!avalon2->works)
- quit(1, "Failed to calloc avalon2 works in avalon2_prepare");
-
if (info->fd == -1)
avalon2_init(avalon2);
@@ -856,7 +851,7 @@ static void avalon2_update(struct cgpu_info *avalon2)
tmp = be32toh(info->fan_pwm);
memcpy(send_pkg.data, &tmp, 4);
- applog(LOG_ERR, "Avalon2: Temp max: %d, Cut off temp: %d",
+ applog(LOG_INFO, "Avalon2: Temp max: %d, Cut off temp: %d",
get_current_temp_max(info), opt_avalon2_overheat);
if (get_current_temp_max(info) >= opt_avalon2_overheat)
tmp = encode_voltage(0);
@@ -1042,12 +1037,8 @@ static char *avalon2_set_device(struct cgpu_info *avalon2, char *option, char *s
return replybuf;
}
-static void avalon2_shutdown(struct thr_info *thr)
+static void avalon2_shutdown(struct thr_info __maybe_unused *thr)
{
- struct cgpu_info *avalon = thr->cgpu;
-
- free(avalon->works);
- avalon->works = NULL;
}
struct device_drv avalon2_drv = {