Skip to content

Commit

Permalink
Staging: comedi: Remove das1800_board typedef
Browse files Browse the repository at this point in the history
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent febc2ed commit ce422cf
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions drivers/staging/comedi/drivers/das1800.c
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ static const struct comedi_lrange range_ai_das1802 = {
}
};

typedef struct das1800_board_struct {
struct das1800_board {
const char *name;
int ai_speed; /* max conversion period in nanoseconds */
int resolution; /* bits of ai resolution */
Expand All @@ -251,13 +251,13 @@ typedef struct das1800_board_struct {
int ao_ability; /* 0 == no analog out, 1 == basic analog out, 2 == waveform analog out */
int ao_n_chan; /* number of analog out channels */
const struct comedi_lrange *range_ai; /* available input ranges */
} das1800_board;
};

/* Warning: the maximum conversion speeds listed below are
* not always achievable depending on board setup (see
* user manual.)
*/
static const das1800_board das1800_boards[] = {
static const struct das1800_board das1800_boards[] = {
{
name: "das-1701st",
ai_speed:6250,
Expand Down Expand Up @@ -461,7 +461,7 @@ static const das1800_board das1800_boards[] = {
/*
* Useful for shorthand access to the particular board structure
*/
#define thisboard ((const das1800_board *)dev->board_ptr)
#define thisboard ((const struct das1800_board *)dev->board_ptr)

typedef struct {
volatile unsigned int count; /* number of data points left to be taken */
Expand Down Expand Up @@ -509,9 +509,9 @@ static struct comedi_driver driver_das1800 = {
module:THIS_MODULE,
attach:das1800_attach,
detach:das1800_detach,
num_names:sizeof(das1800_boards) / sizeof(das1800_board),
num_names:sizeof(das1800_boards) / sizeof(struct das1800_board),
board_name:&das1800_boards[0].name,
offset:sizeof(das1800_board),
offset:sizeof(struct das1800_board),
};

/*
Expand Down Expand Up @@ -799,7 +799,7 @@ static int das1800_probe(struct comedi_device * dev)
int board;

id = (inb(dev->iobase + DAS1800_DIGITAL) >> 4) & 0xf; /* get id bits */
board = ((das1800_board *) dev->board_ptr) - das1800_boards;
board = ((struct das1800_board *) dev->board_ptr) - das1800_boards;

switch (id) {
case 0x3:
Expand Down

0 comments on commit ce422cf

Please sign in to comment.