lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Staging: comedi: pcl812: Remove boardtype typedef

Browse Source 
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Bill Pemberton
2009-03-16 22:17:06 -04:00
committed by Greg Kroah-Hartman
parent 292090dcc8
commit fb1314de41
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/staging/comedi/drivers/pcl812.c
View File

@@ -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_attach(struct comedi_device * dev, struct comedi_devconfig * it);
static int pcl812_detach(struct comedi_device * dev); static int pcl812_detach(struct comedi_device * dev);
typedef struct { struct pcl812_board {
const char *name; // board name const char *name; // board name
int board_type; // type of this board int board_type; // type of this board
int n_aichan; // num of AI chans in S.E. int n_aichan; // num of AI chans in S.E.
@@ -312,9 +313,10 @@ typedef struct {
unsigned char DMAbits; // allowed DMA chans unsigned char DMAbits; // allowed DMA chans
unsigned char io_range; // iorange for this board unsigned char io_range; // iorange for this board
unsigned char haveMPC508; // 1=board use MPC508A multiplexor 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, {"pcl812", boardPCL812, 16, 0, 2, 16, 16, 0x0fff,
33000, 500, &range_bipolar10, &range_unipolar5, 33000, 500, &range_bipolar10, &range_unipolar5,
0xdcfc, 0x0a, PCLx1x_IORANGE, 0}, 0xdcfc, 0x0a, PCLx1x_IORANGE, 0},
@@ -371,8 +373,8 @@ static const boardtype boardtypes[] = {
0xdcfc, 0x0a, PCLx1x_IORANGE, 0}, 0xdcfc, 0x0a, PCLx1x_IORANGE, 0},
}; };
#define n_boardtypes (sizeof(boardtypes)/sizeof(boardtype)) #define n_boardtypes (sizeof(boardtypes)/sizeof(struct pcl812_board))
#define this_board ((const boardtype *)dev->board_ptr) #define this_board ((const struct pcl812_board *)dev->board_ptr)
static struct comedi_driver driver_pcl812 = { static struct comedi_driver driver_pcl812 = {
driver_name:"pcl812", driver_name:"pcl812",
@@ -381,7 +383,7 @@ static struct comedi_driver driver_pcl812 = {
detach:pcl812_detach, detach:pcl812_detach,
board_name:&boardtypes[0].name, board_name:&boardtypes[0].name,
num_names:n_boardtypes, num_names:n_boardtypes,
offset:sizeof(boardtype), offset:sizeof(struct pcl812_board),
}; };
COMEDI_INITCLEANUP(driver_pcl812); COMEDI_INITCLEANUP(driver_pcl812);