diff options
| author | Ian Abbott <abbotti@mev.co.uk> | 2012-08-31 20:41:34 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-04 12:00:41 -0700 |
| commit | dd2ac5d4b7ea7025e6f6e3975bc581944412a7fe (patch) | |
| tree | a5da813b5aa7c92f68156baa9cfdedbb13d40b69 /drivers/staging/comedi/drivers/das08.h | |
| parent | 1effe42da1ee4b424ccd2f8abaea5f838ef6ac93 (diff) | |
staging: comedi: das08: Remove function pointers from board structure
Remove the `ai`, `ao`, `di` and `do` pointers from `struct
das08_board_struct`. These were initialized in `das08_boards[]` and
`das08_cs_boards[]` to point to comedi instruction handler functions for
the subdevice, but there are only two sets of functions depending on
whether the `is_jr` member is true or false, and some of the functions
will be NULL if the corresponding `ai_nbits`, `ao_nbits`, `di_nchan` and
`do_nchan` members are zero. Determine which handler functions to use
in das08_common_attach().
One element of `das08_boards[]` had `ao` set to NULL and `ao_nbits` set
to 12. Set `ao_nbits` to 0 in this case to let das08_common_attach()
know this board has no AO subdevice.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi/drivers/das08.h')
| -rw-r--r-- | drivers/staging/comedi/drivers/das08.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/staging/comedi/drivers/das08.h b/drivers/staging/comedi/drivers/das08.h index 5e005302161b..d70d31921743 100644 --- a/drivers/staging/comedi/drivers/das08.h +++ b/drivers/staging/comedi/drivers/das08.h @@ -36,15 +36,11 @@ struct das08_board_struct { unsigned int id; /* id for pci/pcmcia boards */ enum das08_bustype bustype; bool is_jr; /* true for 'JR' boards */ - void *ai; unsigned int ai_nbits; enum das08_lrange ai_pg; enum das08_ai_encoding ai_encoding; - void *ao; unsigned int ao_nbits; - void *di; unsigned int di_nchan; - void *do_; unsigned int do_nchan; unsigned int i8255_offset; unsigned int i8254_offset; |