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

Staging: comedi: Remove ni_board 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-25 11:04:14 -04:00
committed by Greg Kroah-Hartman
parent 1c6ccf6270
commit 8ab41df0d7
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/comedi/drivers/ni_atmio.c
View File

@@ -114,7 +114,7 @@ are not supported.
#define MAX_N_CALDACS 32 #define MAX_N_CALDACS 32
static const ni_board ni_boards[] = { static const struct ni_board_struct ni_boards[] = {
{device_id:44, {device_id:44,
isapnp_id:0x0000,/* XXX unknown */ isapnp_id:0x0000,/* XXX unknown */
name: "at-mio-16e-1", name: "at-mio-16e-1",

2
drivers/staging/comedi/drivers/ni_pcimio.c
View File

@@ -216,7 +216,7 @@ static const struct comedi_lrange range_ni_M_622x_ao = { 1, {
} }
}; };
static const ni_board ni_boards[] = { static const struct ni_board_struct ni_boards[] = {
{ {
.device_id = 0x0162, // NI also says 0x1620. typo? .device_id = 0x0162, // NI also says 0x1620. typo?
.name = "pci-mio-16xe-50", .name = "pci-mio-16xe-50",

8
drivers/staging/comedi/drivers/ni_stc.h
View File

@@ -1374,7 +1374,7 @@ enum Interrupt_C_Status_Bits {
#define M_SERIES_EEPROM_SIZE 1024 #define M_SERIES_EEPROM_SIZE 1024
typedef struct ni_board_struct { struct ni_board_struct {
int device_id; int device_id;
int isapnp_id; int isapnp_id;
char *name; char *name;
@@ -1401,11 +1401,11 @@ typedef struct ni_board_struct {
unsigned int has_analog_trig:1; unsigned int has_analog_trig:1;
enum caldac_enum caldac[3]; enum caldac_enum caldac[3];
} ni_board; };
#define n_ni_boards (sizeof(ni_boards)/sizeof(ni_board)) #define n_ni_boards (sizeof(ni_boards)/sizeof(struct ni_board_struct))
#define boardtype (*(ni_board *)dev->board_ptr) #define boardtype (*(struct ni_board_struct *)dev->board_ptr)
#define MAX_N_AO_CHAN 8 #define MAX_N_AO_CHAN 8
#define NUM_GPCT 2 #define NUM_GPCT 2