UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: comedi: ni_atmio: cleanup ni_getboardtype() 

Make this function return a pointer to the boardinfo instead of an index.

For aesthetics, rename the function to ni_atmio_probe().

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-06-18 10:54:58 -07:00 committed by Greg Kroah-Hartman
parent e38576ce73
commit 1ee02fe1a1
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/staging/comedi/drivers/ni_atmio.c
View File

@ -274,14 +274,16 @@ static int ni_isapnp_find_board(struct pnp_dev **dev)
return 0; return 0;
} }
static int ni_getboardtype(struct comedi_device *dev) static const struct ni_board_struct *ni_atmio_probe(struct comedi_device *dev)
{ {
int device_id = ni_read_eeprom(dev, 511); int device_id = ni_read_eeprom(dev, 511);
int i; int i;
for (i = 0; i < ARRAY_SIZE(ni_boards); i++) { for (i = 0; i < ARRAY_SIZE(ni_boards); i++) {
if (ni_boards[i].device_id == device_id) const struct ni_board_struct *board = &ni_boards[i];
return i;
if (board->device_id == device_id)
return board;
} }
if (device_id == 255) if (device_id == 255)
dev_err(dev->class_dev, "can't find board\n"); dev_err(dev->class_dev, "can't find board\n");
@ -292,17 +294,16 @@ static int ni_getboardtype(struct comedi_device *dev)
dev_err(dev->class_dev, dev_err(dev->class_dev,
"unknown device ID %d -- contact author\n", device_id); "unknown device ID %d -- contact author\n", device_id);
return -1; return NULL;
} }
static int ni_atmio_attach(struct comedi_device *dev, static int ni_atmio_attach(struct comedi_device *dev,
struct comedi_devconfig *it) struct comedi_devconfig *it)
{ {
const struct ni_board_struct *boardtype; const struct ni_board_struct *board;
struct pnp_dev *isapnp_dev; struct pnp_dev *isapnp_dev;
int ret; int ret;
unsigned long iobase; unsigned long iobase;
int board;
unsigned int irq; unsigned int irq;
ret = ni_alloc_private(dev); ret = ni_alloc_private(dev);
@ -326,15 +327,11 @@ static int ni_atmio_attach(struct comedi_device *dev,
if (ret) if (ret)
return ret; return ret;
/* get board type */ board = ni_atmio_probe(dev);
if (!board)
board = ni_getboardtype(dev); return -ENODEV;
if (board < 0) dev->board_ptr = board;
return -EIO; dev->board_name = board->name;
dev->board_ptr = ni_boards + board;
boardtype = dev->board_ptr;
dev->board_name = boardtype->name;
/* irq stuff */ /* irq stuff */