Commit 7b8f850b authored by Ralf Baechle's avatar Ralf Baechle Committed by Linus Torvalds
Browse files

[PATCH] Fix build errors if bitop functions are do {} while macros 



If one of clear_bit, change_bit or set_bit is defined as a do { } while (0)
function usage of these functions in parenthesis like

  (foo_bit(23, &var))

while be expaned to something like

  (do { ... } while (0)}).

resulting in a build error.  This patch removes the useless parenthesis.

Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
Cc: Trond Myklebust <trond.myklebust@fys.uio.no>
Cc: Neil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e696268a

drivers/block/floppy.c

+6 −6
Original line number Diff line number Diff line
@@ -297,17 +297,17 @@ static int initialising = 1; 
#define DRS (&drive_state[current_drive])

#define DRWE (&write_errors[current_drive])

#define FDCS (&fdc_state[fdc])

#define CLEARF(x) (clear_bit(x##_BIT, &DRS->flags))

#define SETF(x) (set_bit(x##_BIT, &DRS->flags))

#define TESTF(x) (test_bit(x##_BIT, &DRS->flags))

#define CLEARF(x) clear_bit(x##_BIT, &DRS->flags)

#define SETF(x) set_bit(x##_BIT, &DRS->flags)

#define TESTF(x) test_bit(x##_BIT, &DRS->flags)



#define UDP (&drive_params[drive])

#define UDRS (&drive_state[drive])

#define UDRWE (&write_errors[drive])

#define UFDCS (&fdc_state[FDC(drive)])

#define UCLEARF(x) (clear_bit(x##_BIT, &UDRS->flags))

#define USETF(x) (set_bit(x##_BIT, &UDRS->flags))

#define UTESTF(x) (test_bit(x##_BIT, &UDRS->flags))

#define UCLEARF(x) clear_bit(x##_BIT, &UDRS->flags)

#define USETF(x) set_bit(x##_BIT, &UDRS->flags)

#define UTESTF(x) test_bit(x##_BIT, &UDRS->flags)



#define DPRINT(format, args...) printk(DEVICE_NAME "%d: " format, current_drive , ## args)

include/linux/sunrpc/sched.h

+6 −6
Original line number Diff line number Diff line
@@ -150,10 +150,10 @@ struct rpc_call_ops { 
#define RPC_TASK_HAS_TIMER	3

#define RPC_TASK_ACTIVE		4



#define RPC_IS_RUNNING(t)	(test_bit(RPC_TASK_RUNNING, &(t)->tk_runstate))

#define rpc_set_running(t)	(set_bit(RPC_TASK_RUNNING, &(t)->tk_runstate))

#define RPC_IS_RUNNING(t)	test_bit(RPC_TASK_RUNNING, &(t)->tk_runstate)

#define rpc_set_running(t)	set_bit(RPC_TASK_RUNNING, &(t)->tk_runstate)

#define rpc_test_and_set_running(t) \

				(test_and_set_bit(RPC_TASK_RUNNING, &(t)->tk_runstate))

				test_and_set_bit(RPC_TASK_RUNNING, &(t)->tk_runstate)

#define rpc_clear_running(t)	\

	do { \

		smp_mb__before_clear_bit(); \
@@ -161,8 +161,8 @@ struct rpc_call_ops { 
		smp_mb__after_clear_bit(); \

	} while (0)



#define RPC_IS_QUEUED(t)	(test_bit(RPC_TASK_QUEUED, &(t)->tk_runstate))

#define rpc_set_queued(t)	(set_bit(RPC_TASK_QUEUED, &(t)->tk_runstate))

#define RPC_IS_QUEUED(t)	test_bit(RPC_TASK_QUEUED, &(t)->tk_runstate)

#define rpc_set_queued(t)	set_bit(RPC_TASK_QUEUED, &(t)->tk_runstate)

#define rpc_clear_queued(t)	\

	do { \

		smp_mb__before_clear_bit(); \
@@ -179,7 +179,7 @@ struct rpc_call_ops { 
		smp_mb__after_clear_bit(); \

	} while (0)



#define RPC_IS_ACTIVATED(t)	(test_bit(RPC_TASK_ACTIVE, &(t)->tk_runstate))

#define RPC_IS_ACTIVATED(t)	test_bit(RPC_TASK_ACTIVE, &(t)->tk_runstate)



/*

 * Task priorities.

CRA Git | Maintained and supported by SUSTech CRA and CCSE