mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-14 14:42:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

staging: comedi: ke_counter: remove boardinfo

Browse Source 
This driver only supports a single "boardtype". Remove the unneeded
boardinfo struct and its use in the driver.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten
2012-10-08 10:45:22 -07:00
committed by Greg Kroah-Hartman
parent 5f1514bfd2
commit c937876787
1 changed files with 3 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
drivers/staging/comedi/drivers/ke_counter.c
View File

@@ -36,28 +36,9 @@ Kolter Electronic PCI Counter Card.
#include "../comedidev.h"
#define CNT_DRIVER_NAME "ke_counter"
#define PCI_VENDOR_ID_KOLTER 0x1001
#define CNT_CARD_DEVICE_ID 0x0014
/*-- board specification structure ------------------------------------------*/
struct cnt_board_struct {
const char *name;
int device_id;
int cnt_channel_nbr;
int cnt_bits;
};
static const struct cnt_board_struct cnt_boards[] = {
{
.name = CNT_DRIVER_NAME,
.device_id = CNT_CARD_DEVICE_ID,
.cnt_channel_nbr = 3,
.cnt_bits = 24}
};
/*-- counter write ----------------------------------------------------------*/
/* This should be used only for resetting the counters; maybe it is better
@@ -107,34 +88,15 @@ static int cnt_rinsn(struct comedi_device *dev,
return 1;
}
static const void *cnt_find_boardinfo(struct comedi_device *dev,
struct pci_dev *pcidev)
{
const struct cnt_board_struct *board;
int i;
for (i = 0; i < ARRAY_SIZE(cnt_boards); i++) {
board = &cnt_boards[i];
if (board->device_id == pcidev->device)
return board;
}
return NULL;
}
static int cnt_attach_pci(struct comedi_device *dev,
struct pci_dev *pcidev)
{
const struct cnt_board_struct *board;
struct comedi_subdevice *s;
int ret;
comedi_set_hw_dev(dev, &pcidev->dev);
board = cnt_find_boardinfo(dev, pcidev);
if (!board)
return -ENODEV;
dev->board_ptr = board;
dev->board_name = board->name;
dev->board_name = dev->driver->driver_name;
ret = comedi_pci_enable(pcidev, dev->board_name);
if (ret)
@@ -150,8 +112,8 @@ static int cnt_attach_pci(struct comedi_device *dev,
s->type = COMEDI_SUBD_COUNTER;
s->subdev_flags = SDF_READABLE /* | SDF_COMMON */ ;
s->n_chan = board->cnt_channel_nbr;
s->maxdata = (1 << board->cnt_bits) - 1;
s->n_chan = 3;
s->maxdata = 0x00ffffff;
s->insn_read = cnt_rinsn;
s->insn_write = cnt_winsn;