diff options
author | Ian Abbott <abbotti@mev.co.uk> | 2012-09-19 14:37:40 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-21 12:29:54 -0400 |
commit | 44b255f7b13bacb076e2789352e4a8afe19b922e (patch) | |
tree | 7c5763a1a2d037301850263caf6c152d2d1d7103 | |
parent | c8cad4c89ee3b15935c532210ae6ebb5c0a2734d (diff) |
staging: comedi: das16: pass struct comedi_cmd by reference
Change `das16_suggest_transfer_size()` to take a pointer to the `struct
comedi_cmd` instead of passing it by value.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/staging/comedi/drivers/das16.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/staging/comedi/drivers/das16.c b/drivers/staging/comedi/drivers/das16.c index 2a38915c69e8..744376a49d08 100644 --- a/drivers/staging/comedi/drivers/das16.c +++ b/drivers/staging/comedi/drivers/das16.c | |||
@@ -558,7 +558,7 @@ static int das16_cmd_test(struct comedi_device *dev, struct comedi_subdevice *s, | |||
558 | 558 | ||
559 | /* utility function that suggests a dma transfer size in bytes */ | 559 | /* utility function that suggests a dma transfer size in bytes */ |
560 | static unsigned int das16_suggest_transfer_size(struct comedi_device *dev, | 560 | static unsigned int das16_suggest_transfer_size(struct comedi_device *dev, |
561 | struct comedi_cmd cmd) | 561 | const struct comedi_cmd *cmd) |
562 | { | 562 | { |
563 | unsigned int size; | 563 | unsigned int size; |
564 | unsigned int freq; | 564 | unsigned int freq; |
@@ -571,16 +571,16 @@ static unsigned int das16_suggest_transfer_size(struct comedi_device *dev, | |||
571 | 571 | ||
572 | /* otherwise, we are relying on dma terminal count interrupt, | 572 | /* otherwise, we are relying on dma terminal count interrupt, |
573 | * so pick a reasonable size */ | 573 | * so pick a reasonable size */ |
574 | if (cmd.convert_src == TRIG_TIMER) | 574 | if (cmd->convert_src == TRIG_TIMER) |
575 | freq = 1000000000 / cmd.convert_arg; | 575 | freq = 1000000000 / cmd->convert_arg; |
576 | else if (cmd.scan_begin_src == TRIG_TIMER) | 576 | else if (cmd->scan_begin_src == TRIG_TIMER) |
577 | freq = (1000000000 / cmd.scan_begin_arg) * cmd.chanlist_len; | 577 | freq = (1000000000 / cmd->scan_begin_arg) * cmd->chanlist_len; |
578 | /* return some default value */ | 578 | /* return some default value */ |
579 | else | 579 | else |
580 | freq = 0xffffffff; | 580 | freq = 0xffffffff; |
581 | 581 | ||
582 | if (cmd.flags & TRIG_WAKE_EOS) { | 582 | if (cmd->flags & TRIG_WAKE_EOS) { |
583 | size = sample_size * cmd.chanlist_len; | 583 | size = sample_size * cmd->chanlist_len; |
584 | } else { | 584 | } else { |
585 | /* make buffer fill in no more than 1/3 second */ | 585 | /* make buffer fill in no more than 1/3 second */ |
586 | size = (freq / 3) * sample_size; | 586 | size = (freq / 3) * sample_size; |
@@ -592,7 +592,7 @@ static unsigned int das16_suggest_transfer_size(struct comedi_device *dev, | |||
592 | else if (size < sample_size) | 592 | else if (size < sample_size) |
593 | size = sample_size; | 593 | size = sample_size; |
594 | 594 | ||
595 | if (cmd.stop_src == TRIG_COUNT && size > devpriv->adc_byte_count) | 595 | if (cmd->stop_src == TRIG_COUNT && size > devpriv->adc_byte_count) |
596 | size = devpriv->adc_byte_count; | 596 | size = devpriv->adc_byte_count; |
597 | 597 | ||
598 | return size; | 598 | return size; |
@@ -685,7 +685,7 @@ static int das16_cmd_exec(struct comedi_device *dev, struct comedi_subdevice *s) | |||
685 | set_dma_addr(devpriv->dma_chan, | 685 | set_dma_addr(devpriv->dma_chan, |
686 | devpriv->dma_buffer_addr[devpriv->current_buffer]); | 686 | devpriv->dma_buffer_addr[devpriv->current_buffer]); |
687 | /* set appropriate size of transfer */ | 687 | /* set appropriate size of transfer */ |
688 | devpriv->dma_transfer_size = das16_suggest_transfer_size(dev, *cmd); | 688 | devpriv->dma_transfer_size = das16_suggest_transfer_size(dev, cmd); |
689 | set_dma_count(devpriv->dma_chan, devpriv->dma_transfer_size); | 689 | set_dma_count(devpriv->dma_chan, devpriv->dma_transfer_size); |
690 | enable_dma(devpriv->dma_chan); | 690 | enable_dma(devpriv->dma_chan); |
691 | release_dma_lock(flags); | 691 | release_dma_lock(flags); |