mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-02 18:04:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

staging: comedi: adv_pci1723: prefer using the BIT macro

Browse Source 
As suggested by checkpatch.pl, use the BIT macro to define the
register bits.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten
2015-10-09 13:02:51 -07:00
committed by Greg Kroah-Hartman
parent a789fdf817
commit aafbdb1294
1 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
drivers/staging/comedi/drivers/adv_pci1723.c
View File

@@ -51,25 +51,27 @@
#define PCI1723_BOARD_ID_REG 0x10
#define PCI1723_BOARD_ID_MASK (0xf << 0)
#define PCI1723_SYNC_CTRL_REG 0x12
#define PCI1723_SYNC_CTRL_ASYNC (0 << 0)
#define PCI1723_SYNC_CTRL_SYNC (1 << 0)
#define PCI1723_SYNC_CTRL(x) (((x) & 0x1) << 0)
#define PCI1723_SYNC_CTRL_ASYNC PCI1723_SYNC_CTRL(0)
#define PCI1723_SYNC_CTRL_SYNC PCI1723_SYNC_CTRL(1)
#define PCI1723_CTRL_REG 0x14
#define PCI1723_CTRL_BUSY (1 << 15)
#define PCI1723_CTRL_INIT (1 << 14)
#define PCI1723_CTRL_SELF (1 << 8)
#define PCI1723_CTRL_BUSY BIT(15)
#define PCI1723_CTRL_INIT BIT(14)
#define PCI1723_CTRL_SELF BIT(8)
#define PCI1723_CTRL_IDX(x) (((x) & 0x3) << 6)
#define PCI1723_CTRL_RANGE(x) (((x) & 0x3) << 4)
#define PCI1723_CTRL_GAIN (0 << 3)
#define PCI1723_CTRL_OFFSET (1 << 3)
#define PCI1723_CTRL_SEL(x) (((x) & 0x1) << 3)
#define PCI1723_CTRL_GAIN PCI1723_CTRL_SEL(0)
#define PCI1723_CTRL_OFFSET PCI1723_CTRL_SEL(1)
#define PCI1723_CTRL_CHAN(x) (((x) & 0x7) << 0)
#define PCI1723_CALIB_CTRL_REG 0x16
#define PCI1723_CALIB_CTRL_CS (1 << 2)
#define PCI1723_CALIB_CTRL_DAT (1 << 1)
#define PCI1723_CALIB_CTRL_CLK (1 << 0)
#define PCI1723_CALIB_CTRL_CS BIT(2)
#define PCI1723_CALIB_CTRL_DAT BIT(1)
#define PCI1723_CALIB_CTRL_CLK BIT(0)
#define PCI1723_CALIB_STROBE_REG 0x18
#define PCI1723_DIO_CTRL_REG 0x1a
#define PCI1723_DIO_CTRL_HDIO (1 << 1)
#define PCI1723_DIO_CTRL_LDIO (1 << 0)
#define PCI1723_DIO_CTRL_HDIO BIT(1)
#define PCI1723_DIO_CTRL_LDIO BIT(0)
#define PCI1723_DIO_DATA_REG 0x1c
#define PCI1723_CALIB_DATA_REG 0x1e
#define PCI1723_SYNC_STROBE_REG 0x20
@@ -77,9 +79,10 @@
#define PCI1723_RESET_CALIB_STROBE_REG 0x24
#define PCI1723_RANGE_STROBE_REG 0x26
#define PCI1723_VREF_REG 0x28
#define PCI1723_VREF_NEG10V (0 << 0)
#define PCI1723_VREF_0V (1 << 0)
#define PCI1723_VREF_POS10V (3 << 0)
#define PCI1723_VREF(x) (((x) & 0x3) << 0)
#define PCI1723_VREF_NEG10V PCI1723_VREF(0)
#define PCI1723_VREF_0V PCI1723_VREF(1)
#define PCI1723_VREF_POS10V PCI1723_VREF(3)
static int pci1723_ao_insn_write(struct comedi_device *dev,
struct comedi_subdevice *s,