aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2009-03-16 22:17:06 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-04-03 14:54:15 -0700
commitfb1314de41d8fbd14e7aeb735d7849be8a852dbc (patch)
tree2923b461ac1b1886a4bf6dce6a165a0ffd0afd4d
parent292090dcc85a6e8a4132a6551d73bc467b270693 (diff)
Staging: comedi: pcl812: Remove boardtype typedef
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/comedi/drivers/pcl812.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/staging/comedi/drivers/pcl812.c b/drivers/staging/comedi/drivers/pcl812.c
index 424e8096624..11dfd230e56 100644
--- a/drivers/staging/comedi/drivers/pcl812.c
+++ b/drivers/staging/comedi/drivers/pcl812.c
@@ -295,7 +295,8 @@ static const struct comedi_lrange range_a821pgh_ai = { 4, {
static int pcl812_attach(struct comedi_device * dev, struct comedi_devconfig * it);
static int pcl812_detach(struct comedi_device * dev);
-typedef struct {
+struct pcl812_board {
+
const char *name; // board name
int board_type; // type of this board
int n_aichan; // num of AI chans in S.E.
@@ -312,9 +313,10 @@ typedef struct {
unsigned char DMAbits; // allowed DMA chans
unsigned char io_range; // iorange for this board
unsigned char haveMPC508; // 1=board use MPC508A multiplexor
-} boardtype;
+};
+
-static const boardtype boardtypes[] = {
+static const struct pcl812_board boardtypes[] = {
{"pcl812", boardPCL812, 16, 0, 2, 16, 16, 0x0fff,
33000, 500, &range_bipolar10, &range_unipolar5,
0xdcfc, 0x0a, PCLx1x_IORANGE, 0},
@@ -371,8 +373,8 @@ static const boardtype boardtypes[] = {
0xdcfc, 0x0a, PCLx1x_IORANGE, 0},
};
-#define n_boardtypes (sizeof(boardtypes)/sizeof(boardtype))
-#define this_board ((const boardtype *)dev->board_ptr)
+#define n_boardtypes (sizeof(boardtypes)/sizeof(struct pcl812_board))
+#define this_board ((const struct pcl812_board *)dev->board_ptr)
static struct comedi_driver driver_pcl812 = {
driver_name:"pcl812",
@@ -381,7 +383,7 @@ static struct comedi_driver driver_pcl812 = {
detach:pcl812_detach,
board_name:&boardtypes[0].name,
num_names:n_boardtypes,
- offset:sizeof(boardtype),
+ offset:sizeof(struct pcl812_board),
};
COMEDI_INITCLEANUP(driver_pcl812);