diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2015-01-20 14:53:05 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-01-25 19:59:10 +0800 |
| commit | abd2839c596cd598a52f716a9e409d000a40235b (patch) | |
| tree | 1b4a1dd571cb2dab3a3a290cd01b25ecdd9f143b | |
| parent | 177a07296478c025259b97afd28b3ffe56268aea (diff) | |
| download | op-kernel-dev-abd2839c596cd598a52f716a9e409d000a40235b.zip op-kernel-dev-abd2839c596cd598a52f716a9e409d000a40235b.tar.gz | |
staging: comedi: adv_pci1710: remove boardinfo 'ai_ns_min'
The minimum analog input conversion time is 10000 ns for all board types. Remove
this unnecessary boardinfo.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/comedi/drivers/adv_pci1710.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/staging/comedi/drivers/adv_pci1710.c b/drivers/staging/comedi/drivers/adv_pci1710.c index 0664359..634b2a0 100644 --- a/drivers/staging/comedi/drivers/adv_pci1710.c +++ b/drivers/staging/comedi/drivers/adv_pci1710.c @@ -197,7 +197,6 @@ struct boardtype { const struct comedi_lrange *rangelist_ai; /* rangelist for A/D */ const char *rangecode_ai; /* range codes for programming */ const struct comedi_lrange *rangelist_ao; /* rangelist for D/A */ - unsigned int ai_ns_min; /* max sample speed of card v ns */ unsigned int fifo_half_size; /* size of FIFO/2 */ unsigned int has_irq:1; unsigned int has_diff_ai:1; @@ -214,7 +213,6 @@ static const struct boardtype boardtypes[] = { .rangelist_ai = &range_pci1710_3, .rangecode_ai = range_codes_pci1710_3, .rangelist_ao = &range_pci171x_da, - .ai_ns_min = 10000, .fifo_half_size = 2048, .has_irq = 1, .has_diff_ai = 1, @@ -229,7 +227,6 @@ static const struct boardtype boardtypes[] = { .rangelist_ai = &range_pci1710hg, .rangecode_ai = range_codes_pci1710hg, .rangelist_ao = &range_pci171x_da, - .ai_ns_min = 10000, .fifo_half_size = 2048, .has_irq = 1, .has_diff_ai = 1, @@ -244,7 +241,6 @@ static const struct boardtype boardtypes[] = { .rangelist_ai = &range_pci17x1, .rangecode_ai = range_codes_pci17x1, .rangelist_ao = &range_pci171x_da, - .ai_ns_min = 10000, .fifo_half_size = 512, .has_irq = 1, .has_di_do = 1, @@ -256,7 +252,6 @@ static const struct boardtype boardtypes[] = { .n_aichan = 32, .rangelist_ai = &range_pci1710_3, .rangecode_ai = range_codes_pci1710_3, - .ai_ns_min = 10000, .fifo_half_size = 2048, .has_irq = 1, .has_diff_ai = 1, @@ -273,7 +268,6 @@ static const struct boardtype boardtypes[] = { .n_aichan = 16, .rangelist_ai = &range_pci17x1, .rangecode_ai = range_codes_pci17x1, - .ai_ns_min = 10000, .fifo_half_size = 512, .has_irq = 1, .has_di_do = 1, @@ -928,7 +922,6 @@ static int pci171x_ai_cmdtest(struct comedi_device *dev, struct comedi_subdevice *s, struct comedi_cmd *cmd) { - const struct boardtype *this_board = dev->board_ptr; struct pci1710_private *devpriv = dev->private; int err = 0; unsigned int arg; @@ -961,8 +954,7 @@ static int pci171x_ai_cmdtest(struct comedi_device *dev, err |= cfc_check_trigger_arg_is(&cmd->scan_begin_arg, 0); if (cmd->convert_src == TRIG_TIMER) - err |= cfc_check_trigger_arg_min(&cmd->convert_arg, - this_board->ai_ns_min); + err |= cfc_check_trigger_arg_min(&cmd->convert_arg, 10000); else /* TRIG_FOLLOW */ err |= cfc_check_trigger_arg_is(&cmd->convert_arg, 0); |
