Commit a74236f70383ecc7eb00d9655664e38e65e900e2
2013-10-01T20:58:53
Remove unused parameter in two inline functions
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 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164
diff --git a/driver-knc-spi-fpga.c b/driver-knc-spi-fpga.c
index 190bf9c..2a291bc 100644
--- a/driver-knc-spi-fpga.c
+++ b/driver-knc-spi-fpga.c
@@ -164,7 +164,7 @@ static inline bool knc_active_fifo_full(struct knc_state *knc)
return (knc->read_a == knc->write_a);
}
-static inline void knc_queued_fifo_inc_idx(struct knc_state *knc, int *idx)
+static inline void knc_queued_fifo_inc_idx(int *idx)
{
if (unlikely(*idx >= (KNC_QUEUED_BUFFER_SIZE - 1)))
*idx = 0;
@@ -172,7 +172,7 @@ static inline void knc_queued_fifo_inc_idx(struct knc_state *knc, int *idx)
++(*idx);
}
-static inline void knc_active_fifo_inc_idx(struct knc_state *knc, int *idx)
+static inline void knc_active_fifo_inc_idx(int *idx)
{
if (unlikely(*idx >= (KNC_ACTIVE_BUFFER_SIZE - 1)))
*idx = 0;
@@ -348,7 +348,7 @@ static int64_t knc_process_response(struct thr_info *thr, struct cgpu_info *cgpu
submitted = 0;
for (i = 0; i < works; ++i) {
next_read_q = knc->read_q;
- knc_queued_fifo_inc_idx(knc, &next_read_q);
+ knc_queued_fifo_inc_idx(&next_read_q);
if ((next_read_q == knc->write_q) || knc_active_fifo_full(knc))
break;
memcpy(&knc->active_fifo[knc->write_a],
@@ -357,7 +357,7 @@ static int64_t knc_process_response(struct thr_info *thr, struct cgpu_info *cgpu
knc->jupiter_work_start[knc->write_a] = now;
knc->queued_fifo[next_read_q].work = NULL;
knc->read_q = next_read_q;
- knc_active_fifo_inc_idx(knc, &knc->write_a);
+ knc_active_fifo_inc_idx(&knc->write_a);
++submitted;
}
if (submitted > 0) {
@@ -370,7 +370,7 @@ static int64_t knc_process_response(struct thr_info *thr, struct cgpu_info *cgpu
/* check for completed works */
completed = 0;
next_read_a = knc->read_a;
- knc_active_fifo_inc_idx(knc, &next_read_a);
+ knc_active_fifo_inc_idx(&next_read_a);
while (next_read_a != knc->write_a) {
us = timediff(&now, &knc->jupiter_work_start[next_read_a]);
if ((us >= 0) && (us < 4000000))
@@ -381,7 +381,7 @@ static int64_t knc_process_response(struct thr_info *thr, struct cgpu_info *cgpu
submit_nonce(thr, work, 0);
work_completed(cgpu, work);
knc->active_fifo[next_read_a].work = NULL;
- knc_active_fifo_inc_idx(knc, &next_read_a);
+ knc_active_fifo_inc_idx(&next_read_a);
++completed;
}
#else
@@ -404,7 +404,7 @@ static int64_t knc_process_response(struct thr_info *thr, struct cgpu_info *cgpu
submitted = 0;
for (i = 0; i < rxbuf->works_accepted; ++i) {
next_read_q = knc->read_q;
- knc_queued_fifo_inc_idx(knc, &next_read_q);
+ knc_queued_fifo_inc_idx(&next_read_q);
if ((next_read_q == knc->write_q) || knc_active_fifo_full(knc))
break;
memcpy(&knc->active_fifo[knc->write_a],
@@ -413,7 +413,7 @@ static int64_t knc_process_response(struct thr_info *thr, struct cgpu_info *cgpu
knc->active_fifo[knc->write_a].begin = now;
knc->queued_fifo[next_read_q].work = NULL;
knc->read_q = next_read_q;
- knc_active_fifo_inc_idx(knc, &knc->write_a);
+ knc_active_fifo_inc_idx(&knc->write_a);
++submitted;
}
if (submitted != rxbuf->works_accepted)
@@ -440,7 +440,7 @@ static int64_t knc_process_response(struct thr_info *thr, struct cgpu_info *cgpu
rxbuf->responses[i].work_id);
/* Find active work with matching ID */
next_read_a = knc->read_a;
- knc_active_fifo_inc_idx(knc, &next_read_a);
+ knc_active_fifo_inc_idx(&next_read_a);
while (next_read_a != knc->write_a) {
if (knc->active_fifo[next_read_a].work_id ==
rxbuf->responses[i].work_id)
@@ -454,7 +454,7 @@ static int64_t knc_process_response(struct thr_info *thr, struct cgpu_info *cgpu
"KnC spi: remove stale work %u",
knc->active_fifo[next_read_a].work_id);
work = knc->active_fifo[next_read_a].work;
- knc_active_fifo_inc_idx(knc, &knc->read_a);
+ knc_active_fifo_inc_idx(&knc->read_a);
work_completed(cgpu, work);
if (next_read_a != knc->read_a)
memcpy(&(knc->active_fifo[next_read_a]),
@@ -463,7 +463,7 @@ static int64_t knc_process_response(struct thr_info *thr, struct cgpu_info *cgpu
knc->active_fifo[knc->read_a].work = NULL;
}
- knc_active_fifo_inc_idx(knc, &next_read_a);
+ knc_active_fifo_inc_idx(&next_read_a);
}
if (next_read_a == knc->write_a)
continue;
@@ -494,7 +494,7 @@ static int64_t knc_process_response(struct thr_info *thr, struct cgpu_info *cgpu
}
/* Work completed */
- knc_active_fifo_inc_idx(knc, &knc->read_a);
+ knc_active_fifo_inc_idx(&knc->read_a);
work_completed(cgpu, work);
if (next_read_a != knc->read_a)
memcpy(&(knc->active_fifo[next_read_a]),
@@ -652,11 +652,11 @@ static int64_t knc_scanwork(struct thr_info *thr)
memset(spi_txbuf, 0, sizeof(spi_txbuf));
num = 0;
next_read_q = knc->read_q;
- knc_queued_fifo_inc_idx(knc, &next_read_q);
+ knc_queued_fifo_inc_idx(&next_read_q);
while (next_read_q != knc->write_q) {
knc_work_from_queue_to_spi(knc, &knc->queued_fifo[next_read_q],
&spi_txbuf[num]);
- knc_queued_fifo_inc_idx(knc, &next_read_q);
+ knc_queued_fifo_inc_idx(&next_read_q);
++num;
}
/* knc->read_q is advanced in knc_process_response, not here */
@@ -686,7 +686,7 @@ static bool knc_queue_full(struct cgpu_info *cgpu)
break;
}
knc->queued_fifo[knc->write_q].work = work;
- knc_queued_fifo_inc_idx(knc, &(knc->write_q));
+ knc_queued_fifo_inc_idx(&(knc->write_q));
}
return queue_full;
@@ -703,24 +703,24 @@ static void knc_flush_work(struct cgpu_info *cgpu)
/* Drain queued works */
next_read_q = knc->read_q;
- knc_queued_fifo_inc_idx(knc, &next_read_q);
+ knc_queued_fifo_inc_idx(&next_read_q);
while (next_read_q != knc->write_q) {
work = knc->queued_fifo[next_read_q].work;
work_completed(cgpu, work);
knc->queued_fifo[next_read_q].work = NULL;
knc->read_q = next_read_q;
- knc_queued_fifo_inc_idx(knc, &next_read_q);
+ knc_queued_fifo_inc_idx(&next_read_q);
}
/* Drain active works */
next_read_a = knc->read_a;
- knc_active_fifo_inc_idx(knc, &next_read_a);
+ knc_active_fifo_inc_idx(&next_read_a);
while (next_read_a != knc->write_a) {
work = knc->active_fifo[next_read_a].work;
work_completed(cgpu, work);
knc->active_fifo[next_read_a].work = NULL;
knc->read_a = next_read_a;
- knc_active_fifo_inc_idx(knc, &next_read_a);
+ knc_active_fifo_inc_idx(&next_read_a);
}
len = _internal_knc_flush_fpga(knc);