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_at_a2150: cleanup a2150_probe() 

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

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:43 -07:00 committed by Greg Kroah-Hartman
parent 6e2b126dbd
commit 30f2306642
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/staging/comedi/drivers/ni_at_a2150.c
View File

@ -687,12 +687,14 @@ static void a2150_free_dma(struct comedi_device *dev)
comedi_isadma_free(devpriv->dma);
}
/* probes board type, returns offset */
static int a2150_probe(struct comedi_device *dev)
static const struct a2150_board *a2150_probe(struct comedi_device *dev)
{
int status = inw(dev->iobase + STATUS_REG);
int id = ID_BITS(inw(dev->iobase + STATUS_REG));
return ID_BITS(status);
if (id >= ARRAY_SIZE(a2150_boards))
return NULL;
return &a2150_boards[id];
}
static int a2150_attach(struct comedi_device *dev, struct comedi_devconfig *it)
@ -712,12 +714,10 @@ static int a2150_attach(struct comedi_device *dev, struct comedi_devconfig *it)
if (ret)
return ret;
i = a2150_probe(dev);
if (i >= ARRAY_SIZE(a2150_boards))
thisboard = a2150_probe(dev);
if (!thisboard)
return -ENODEV;
dev->board_ptr = a2150_boards + i;
thisboard = dev->board_ptr;
dev->board_ptr = thisboard;
dev->board_name = thisboard->name;
/* an IRQ and DMA are required to support async commands */