Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9cee3d40 authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman
Browse files

staging: comedi: comedi.h: Do not use BIT macro 



The "comedi.h" file is part of the user API for COMEDI devices, and is
intended to be migrated to "include/uapi/linux".  The `BIT` macro from
"include/linux/bitops.h" should not be used there.

Replace the use of the `BIT` macro with hexadecimal constants of the
same value.  The `BIT` macro replaced expressions of the form `(1 << N)`
in this file originally, but reverting back to that form would encourage
patches changing them back to use the `BIT` macro.

Signed-off-by: default avatarIan Abbott <abbotti@mev.co.uk>
Reviewed-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2517cd14

drivers/staging/comedi/comedi.h

+5 −5
Original line number Diff line number Diff line
@@ -72,12 +72,12 @@ 
#define CR_AREF(a)	(((a) >> 24) & 0x03)



#define CR_FLAGS_MASK	0xfc000000

#define CR_ALT_FILTER	BIT(26)

#define CR_ALT_FILTER	0x04000000

#define CR_DITHER	CR_ALT_FILTER

#define CR_DEGLITCH	CR_ALT_FILTER

#define CR_ALT_SOURCE	BIT(27)

#define CR_EDGE		BIT(30)

#define CR_INVERT	BIT(31)

#define CR_ALT_SOURCE	0x08000000

#define CR_EDGE		0x40000000

#define CR_INVERT	0x80000000



#define AREF_GROUND	0x00	/* analog ref = analog ground */

#define AREF_COMMON	0x01	/* analog ref = analog common */
@@ -894,7 +894,7 @@ struct comedi_bufinfo { 
#define RANGE_LENGTH(b)		((b) & 0xffff)



#define RF_UNIT(flags)		((flags) & 0xff)

#define RF_EXTERNAL		BIT(8)

#define RF_EXTERNAL		0x100



#define UNIT_volt		0

#define UNIT_mA			1