Commit 193a21e4 authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman

Staging: comedi: Remove boardtype typedef in adl_pci9118.c

Signed-off-by: default avatarBill Pemberton <wfp5p@virginia.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 52f8ac98
...@@ -181,7 +181,7 @@ static const struct comedi_lrange range_pci9118hg = { 8, { ...@@ -181,7 +181,7 @@ static const struct comedi_lrange range_pci9118hg = { 8, {
static int pci9118_attach(struct comedi_device * dev, struct comedi_devconfig * it); static int pci9118_attach(struct comedi_device * dev, struct comedi_devconfig * it);
static int pci9118_detach(struct comedi_device * dev); static int pci9118_detach(struct comedi_device * dev);
typedef struct { struct boardtype {
const char *name; // board name const char *name; // board name
int vendor_id; // PCI vendor a device ID of card int vendor_id; // PCI vendor a device ID of card
int device_id; int device_id;
...@@ -200,7 +200,7 @@ typedef struct { ...@@ -200,7 +200,7 @@ typedef struct {
unsigned int ai_pacer_min; // minimal pacer value (c1*c2 or c1 in burst) unsigned int ai_pacer_min; // minimal pacer value (c1*c2 or c1 in burst)
int half_fifo_size; // size of FIFO/2 int half_fifo_size; // size of FIFO/2
} boardtype; };
static DEFINE_PCI_DEVICE_TABLE(pci9118_pci_table) = { static DEFINE_PCI_DEVICE_TABLE(pci9118_pci_table) = {
{PCI_VENDOR_ID_AMCC, 0x80d9, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, {PCI_VENDOR_ID_AMCC, 0x80d9, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
...@@ -209,7 +209,7 @@ static DEFINE_PCI_DEVICE_TABLE(pci9118_pci_table) = { ...@@ -209,7 +209,7 @@ static DEFINE_PCI_DEVICE_TABLE(pci9118_pci_table) = {
MODULE_DEVICE_TABLE(pci, pci9118_pci_table); MODULE_DEVICE_TABLE(pci, pci9118_pci_table);
static const boardtype boardtypes[] = { static const struct boardtype boardtypes[] = {
{"pci9118dg", PCI_VENDOR_ID_AMCC, 0x80d9, {"pci9118dg", PCI_VENDOR_ID_AMCC, 0x80d9,
AMCC_OP_REG_SIZE, IORANGE_9118, AMCC_OP_REG_SIZE, IORANGE_9118,
16, 8, 256, PCI9118_CHANLEN, 2, 0x0fff, 0x0fff, 16, 8, 256, PCI9118_CHANLEN, 2, 0x0fff, 0x0fff,
...@@ -227,7 +227,7 @@ static const boardtype boardtypes[] = { ...@@ -227,7 +227,7 @@ static const boardtype boardtypes[] = {
10000, 40, 512}, 10000, 40, 512},
}; };
#define n_boardtypes (sizeof(boardtypes)/sizeof(boardtype)) #define n_boardtypes (sizeof(boardtypes)/sizeof(struct boardtype))
static struct comedi_driver driver_pci9118 = { static struct comedi_driver driver_pci9118 = {
driver_name:"adl_pci9118", driver_name:"adl_pci9118",
...@@ -236,7 +236,7 @@ static struct comedi_driver driver_pci9118 = { ...@@ -236,7 +236,7 @@ static struct comedi_driver driver_pci9118 = {
detach:pci9118_detach, detach:pci9118_detach,
num_names:n_boardtypes, num_names:n_boardtypes,
board_name:&boardtypes[0].name, board_name:&boardtypes[0].name,
offset:sizeof(boardtype), offset:sizeof(struct boardtype),
}; };
COMEDI_PCI_INITCLEANUP(driver_pci9118, pci9118_pci_table); COMEDI_PCI_INITCLEANUP(driver_pci9118, pci9118_pci_table);
...@@ -302,7 +302,7 @@ typedef struct { ...@@ -302,7 +302,7 @@ typedef struct {
} pci9118_private; } pci9118_private;
#define devpriv ((pci9118_private *)dev->private) #define devpriv ((pci9118_private *)dev->private)
#define this_board ((boardtype *)dev->board_ptr) #define this_board ((struct boardtype *)dev->board_ptr)
/* /*
============================================================================== ==============================================================================
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment