Commit 657f81ec authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman

Staging: comedi: Remove pcmmio_board typedef

Signed-off-by: default avatarBill Pemberton <wfp5p@virginia.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent d89da617
...@@ -154,7 +154,7 @@ static int ao_winsn(struct comedi_device *, struct comedi_subdevice *, struct co ...@@ -154,7 +154,7 @@ static int ao_winsn(struct comedi_device *, struct comedi_subdevice *, struct co
* boards in this way is optional, and completely driver-dependent. * boards in this way is optional, and completely driver-dependent.
* Some drivers use arrays such as this, other do not. * Some drivers use arrays such as this, other do not.
*/ */
typedef struct pcmmio_board_struct { struct pcmmio_board {
const char *name; const char *name;
const int dio_num_asics; const int dio_num_asics;
const int dio_num_ports; const int dio_num_ports;
...@@ -165,7 +165,7 @@ typedef struct pcmmio_board_struct { ...@@ -165,7 +165,7 @@ typedef struct pcmmio_board_struct {
const int n_ao_chans; const int n_ao_chans;
const struct comedi_lrange *ai_range_table, *ao_range_table; const struct comedi_lrange *ai_range_table, *ao_range_table;
comedi_insn_fn_t ai_rinsn, ao_rinsn, ao_winsn; comedi_insn_fn_t ai_rinsn, ao_rinsn, ao_winsn;
} pcmmio_board; };
static const struct comedi_lrange ranges_ai = static const struct comedi_lrange ranges_ai =
{ 4, {RANGE(-5., 5.), RANGE(-10., 10.), RANGE(0., 5.), RANGE(0., { 4, {RANGE(-5., 5.), RANGE(-10., 10.), RANGE(0., 5.), RANGE(0.,
...@@ -177,7 +177,7 @@ static const struct comedi_lrange ranges_ao = ...@@ -177,7 +177,7 @@ static const struct comedi_lrange ranges_ao =
RANGE(-2.5, 2.5), RANGE(-2.5, 7.5)} RANGE(-2.5, 2.5), RANGE(-2.5, 7.5)}
}; };
static const pcmmio_board pcmmio_boards[] = { static const struct pcmmio_board pcmmio_boards[] = {
{ {
name: "pcmmio", name: "pcmmio",
dio_num_asics:1, dio_num_asics:1,
...@@ -197,7 +197,7 @@ static const pcmmio_board pcmmio_boards[] = { ...@@ -197,7 +197,7 @@ static const pcmmio_board pcmmio_boards[] = {
/* /*
* Useful for shorthand access to the particular board structure * Useful for shorthand access to the particular board structure
*/ */
#define thisboard ((const pcmmio_board *)dev->board_ptr) #define thisboard ((const struct pcmmio_board *)dev->board_ptr)
/* this structure is for data unique to this subdevice. */ /* this structure is for data unique to this subdevice. */
typedef struct { typedef struct {
...@@ -291,8 +291,8 @@ static struct comedi_driver driver = { ...@@ -291,8 +291,8 @@ static struct comedi_driver driver = {
* devices are such boards. * devices are such boards.
*/ */
board_name:&pcmmio_boards[0].name, board_name:&pcmmio_boards[0].name,
offset:sizeof(pcmmio_board), offset:sizeof(struct pcmmio_board),
num_names:sizeof(pcmmio_boards) / sizeof(pcmmio_board), num_names:sizeof(pcmmio_boards) / sizeof(struct pcmmio_board),
}; };
static int pcmmio_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s, static int pcmmio_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s,
......
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