Commit c7fb4aad787911e3e2b9b57df6b7551a2e9c4305
2013-09-29T17:21:32
Icarus remove unneeded opt_debug tests due to applog being a macro
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 49 50 51 52 53 54 55 56 57 58 59 60 61 62
diff --git a/driver-icarus.c b/driver-icarus.c
index 9ad4e43..6ac1a0b 100644
--- a/driver-icarus.c
+++ b/driver-icarus.c
@@ -474,10 +474,7 @@ static int icarus_get_nonce(struct cgpu_info *icarus, unsigned char *buf, struct
}
if (thr && thr->work_restart) {
- if (opt_debug) {
- applog(LOG_DEBUG,
- "Icarus Read: Work restart at %d ms", rc);
- }
+ applog(LOG_DEBUG, "Icarus Read: Work restart at %d ms", rc);
return ICA_NONCE_RESTART;
}
@@ -493,10 +490,7 @@ static int icarus_get_nonce(struct cgpu_info *icarus, unsigned char *buf, struct
cgsleep_ms(delay);
if (thr && thr->work_restart) {
- if (opt_debug) {
- applog(LOG_DEBUG,
- "Icarus Read: Work restart at %d ms", rc);
- }
+ applog(LOG_DEBUG, "Icarus Read: Work restart at %d ms", rc);
return ICA_NONCE_RESTART;
}
}
@@ -1055,12 +1049,10 @@ static int64_t icarus_scanhash(struct thr_info *thr, struct work *work,
if (unlikely(estimate_hashes > 0xffffffff))
estimate_hashes = 0xffffffff;
- if (opt_debug) {
- applog(LOG_DEBUG, "%s%d: no nonce = 0x%08lX hashes (%ld.%06lds)",
- icarus->drv->name, icarus->device_id,
- (long unsigned int)estimate_hashes,
- elapsed.tv_sec, elapsed.tv_usec);
- }
+ applog(LOG_DEBUG, "%s%d: no nonce = 0x%08lX hashes (%ld.%06lds)",
+ icarus->drv->name, icarus->device_id,
+ (long unsigned int)estimate_hashes,
+ elapsed.tv_sec, elapsed.tv_usec);
return estimate_hashes;
}
@@ -1092,12 +1084,10 @@ static int64_t icarus_scanhash(struct thr_info *thr, struct work *work,
if (opt_debug || info->do_icarus_timing)
timersub(&tv_finish, &tv_start, &elapsed);
- if (opt_debug) {
- applog(LOG_DEBUG, "%s%d: nonce = 0x%08x = 0x%08lX hashes (%ld.%06lds)",
- icarus->drv->name, icarus->device_id,
- nonce, (long unsigned int)hash_count,
- elapsed.tv_sec, elapsed.tv_usec);
- }
+ applog(LOG_DEBUG, "%s%d: nonce = 0x%08x = 0x%08lX hashes (%ld.%06lds)",
+ icarus->drv->name, icarus->device_id,
+ nonce, (long unsigned int)hash_count,
+ elapsed.tv_sec, elapsed.tv_usec);
// Ignore possible end condition values ... and hw errors
// TODO: set limitations on calculated values depending on the device