openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: comedi: adv_pci1724: define the board id register bits 

For aesthetics, remove the enum and define the bits for this register.

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 2014-11-20 15:10:56 -07:00 committed by Greg Kroah-Hartman
parent 80b00a5842
commit 70adf763ba
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/staging/comedi/drivers/adv_pci1724.c
View File

@ -74,10 +74,7 @@ supported PCI devices are configured as comedi devices automatically.
#define PCI1724_EEPROM_CTRL_REG 0x08 #define PCI1724_EEPROM_CTRL_REG 0x08
#define PCI1724_SYNC_TRIG_REG 0x0c /* any value works */ #define PCI1724_SYNC_TRIG_REG 0x0c /* any value works */
#define PCI1724_BOARD_ID_REG 0x10 #define PCI1724_BOARD_ID_REG 0x10
#define PCI1724_BOARD_ID_MASK (0xf << 0)
enum board_id_contents {
BOARD_ID_MASK = 0xf
};
static const struct comedi_lrange ao_ranges_1724 = { static const struct comedi_lrange ao_ranges_1724 = {
4, { 4, {
@ -199,8 +196,9 @@ static int adv_pci1724_auto_attach(struct comedi_device *dev,
return retval; return retval;
dev->iobase = pci_resource_start(pcidev, 2); dev->iobase = pci_resource_start(pcidev, 2);
board_id = inl(dev->iobase + PCI1724_BOARD_ID_REG) & BOARD_ID_MASK; board_id = inl(dev->iobase + PCI1724_BOARD_ID_REG);
dev_info(dev->class_dev, "board id: %d\n", board_id); dev_info(dev->class_dev, "board id: %d\n",
board_id & PCI1724_BOARD_ID_MASK);
retval = setup_subdevices(dev); retval = setup_subdevices(dev);
if (retval < 0) if (retval < 0)