diff options
-rw-r--r-- | drivers/block/floppy.c | 12 | ||||
-rw-r--r-- | include/linux/sunrpc/sched.h | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index 3f1b38276e96..5231ed7e723f 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c | |||
@@ -297,17 +297,17 @@ static int initialising = 1; | |||
297 | #define DRS (&drive_state[current_drive]) | 297 | #define DRS (&drive_state[current_drive]) |
298 | #define DRWE (&write_errors[current_drive]) | 298 | #define DRWE (&write_errors[current_drive]) |
299 | #define FDCS (&fdc_state[fdc]) | 299 | #define FDCS (&fdc_state[fdc]) |
300 | #define CLEARF(x) (clear_bit(x##_BIT, &DRS->flags)) | 300 | #define CLEARF(x) clear_bit(x##_BIT, &DRS->flags) |
301 | #define SETF(x) (set_bit(x##_BIT, &DRS->flags)) | 301 | #define SETF(x) set_bit(x##_BIT, &DRS->flags) |
302 | #define TESTF(x) (test_bit(x##_BIT, &DRS->flags)) | 302 | #define TESTF(x) test_bit(x##_BIT, &DRS->flags) |
303 | 303 | ||
304 | #define UDP (&drive_params[drive]) | 304 | #define UDP (&drive_params[drive]) |
305 | #define UDRS (&drive_state[drive]) | 305 | #define UDRS (&drive_state[drive]) |
306 | #define UDRWE (&write_errors[drive]) | 306 | #define UDRWE (&write_errors[drive]) |
307 | #define UFDCS (&fdc_state[FDC(drive)]) | 307 | #define UFDCS (&fdc_state[FDC(drive)]) |
308 | #define UCLEARF(x) (clear_bit(x##_BIT, &UDRS->flags)) | 308 | #define UCLEARF(x) clear_bit(x##_BIT, &UDRS->flags) |
309 | #define USETF(x) (set_bit(x##_BIT, &UDRS->flags)) | 309 | #define USETF(x) set_bit(x##_BIT, &UDRS->flags) |
310 | #define UTESTF(x) (test_bit(x##_BIT, &UDRS->flags)) | 310 | #define UTESTF(x) test_bit(x##_BIT, &UDRS->flags) |
311 | 311 | ||
312 | #define DPRINT(format, args...) printk(DEVICE_NAME "%d: " format, current_drive , ## args) | 312 | #define DPRINT(format, args...) printk(DEVICE_NAME "%d: " format, current_drive , ## args) |
313 | 313 | ||
diff --git a/include/linux/sunrpc/sched.h b/include/linux/sunrpc/sched.h index de9fc576fa1c..3069ecca0129 100644 --- a/include/linux/sunrpc/sched.h +++ b/include/linux/sunrpc/sched.h | |||
@@ -150,10 +150,10 @@ struct rpc_call_ops { | |||
150 | #define RPC_TASK_HAS_TIMER 3 | 150 | #define RPC_TASK_HAS_TIMER 3 |
151 | #define RPC_TASK_ACTIVE 4 | 151 | #define RPC_TASK_ACTIVE 4 |
152 | 152 | ||
153 | #define RPC_IS_RUNNING(t) (test_bit(RPC_TASK_RUNNING, &(t)->tk_runstate)) | 153 | #define RPC_IS_RUNNING(t) test_bit(RPC_TASK_RUNNING, &(t)->tk_runstate) |
154 | #define rpc_set_running(t) (set_bit(RPC_TASK_RUNNING, &(t)->tk_runstate)) | 154 | #define rpc_set_running(t) set_bit(RPC_TASK_RUNNING, &(t)->tk_runstate) |
155 | #define rpc_test_and_set_running(t) \ | 155 | #define rpc_test_and_set_running(t) \ |
156 | (test_and_set_bit(RPC_TASK_RUNNING, &(t)->tk_runstate)) | 156 | test_and_set_bit(RPC_TASK_RUNNING, &(t)->tk_runstate) |
157 | #define rpc_clear_running(t) \ | 157 | #define rpc_clear_running(t) \ |
158 | do { \ | 158 | do { \ |
159 | smp_mb__before_clear_bit(); \ | 159 | smp_mb__before_clear_bit(); \ |
@@ -161,8 +161,8 @@ struct rpc_call_ops { | |||
161 | smp_mb__after_clear_bit(); \ | 161 | smp_mb__after_clear_bit(); \ |
162 | } while (0) | 162 | } while (0) |
163 | 163 | ||
164 | #define RPC_IS_QUEUED(t) (test_bit(RPC_TASK_QUEUED, &(t)->tk_runstate)) | 164 | #define RPC_IS_QUEUED(t) test_bit(RPC_TASK_QUEUED, &(t)->tk_runstate) |
165 | #define rpc_set_queued(t) (set_bit(RPC_TASK_QUEUED, &(t)->tk_runstate)) | 165 | #define rpc_set_queued(t) set_bit(RPC_TASK_QUEUED, &(t)->tk_runstate) |
166 | #define rpc_clear_queued(t) \ | 166 | #define rpc_clear_queued(t) \ |
167 | do { \ | 167 | do { \ |
168 | smp_mb__before_clear_bit(); \ | 168 | smp_mb__before_clear_bit(); \ |
@@ -179,7 +179,7 @@ struct rpc_call_ops { | |||
179 | smp_mb__after_clear_bit(); \ | 179 | smp_mb__after_clear_bit(); \ |
180 | } while (0) | 180 | } while (0) |
181 | 181 | ||
182 | #define RPC_IS_ACTIVATED(t) (test_bit(RPC_TASK_ACTIVE, &(t)->tk_runstate)) | 182 | #define RPC_IS_ACTIVATED(t) test_bit(RPC_TASK_ACTIVE, &(t)->tk_runstate) |
183 | 183 | ||
184 | /* | 184 | /* |
185 | * Task priorities. | 185 | * Task priorities. |