diff options
author | Ian Abbott <abbotti@mev.co.uk> | 2012-09-19 14:37:42 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-21 12:29:54 -0400 |
commit | 62fea8c8f1bf5ca33ba55b3f421d9598a68297ee (patch) | |
tree | a7352d3c723ba8b3dbf65755a0adb8eb503ecdc2 | |
parent | eb4332eff5aa071b19f89f45ae7f6393af59ba62 (diff) |
staging: comedi: ni_labpc: don't pass struct comedi_cmd by value
`labpc_suggest_transfer_size()` has a parameter of type `struct
comedi_cmd` passed by value. Change it to pass by pointer reference.
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/ni_labpc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/comedi/drivers/ni_labpc.c b/drivers/staging/comedi/drivers/ni_labpc.c index 200099e4c220..d534e63d886e 100644 --- a/drivers/staging/comedi/drivers/ni_labpc.c +++ b/drivers/staging/comedi/drivers/ni_labpc.c | |||
@@ -246,7 +246,7 @@ static int labpc_eeprom_write_insn(struct comedi_device *dev, | |||
246 | static void labpc_adc_timing(struct comedi_device *dev, struct comedi_cmd *cmd, | 246 | static void labpc_adc_timing(struct comedi_device *dev, struct comedi_cmd *cmd, |
247 | enum scan_mode scan_mode); | 247 | enum scan_mode scan_mode); |
248 | #ifdef CONFIG_ISA_DMA_API | 248 | #ifdef CONFIG_ISA_DMA_API |
249 | static unsigned int labpc_suggest_transfer_size(struct comedi_cmd cmd); | 249 | static unsigned int labpc_suggest_transfer_size(const struct comedi_cmd *cmd); |
250 | #endif | 250 | #endif |
251 | static int labpc_dio_mem_callback(int dir, int port, int data, | 251 | static int labpc_dio_mem_callback(int dir, int port, int data, |
252 | unsigned long arg); | 252 | unsigned long arg); |
@@ -1318,7 +1318,7 @@ static int labpc_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s) | |||
1318 | set_dma_addr(devpriv->dma_chan, | 1318 | set_dma_addr(devpriv->dma_chan, |
1319 | virt_to_bus(devpriv->dma_buffer)); | 1319 | virt_to_bus(devpriv->dma_buffer)); |
1320 | /* set appropriate size of transfer */ | 1320 | /* set appropriate size of transfer */ |
1321 | devpriv->dma_transfer_size = labpc_suggest_transfer_size(*cmd); | 1321 | devpriv->dma_transfer_size = labpc_suggest_transfer_size(cmd); |
1322 | if (cmd->stop_src == TRIG_COUNT && | 1322 | if (cmd->stop_src == TRIG_COUNT && |
1323 | devpriv->count * sample_size < devpriv->dma_transfer_size) { | 1323 | devpriv->count * sample_size < devpriv->dma_transfer_size) { |
1324 | devpriv->dma_transfer_size = | 1324 | devpriv->dma_transfer_size = |
@@ -1771,13 +1771,13 @@ static int labpc_eeprom_write_insn(struct comedi_device *dev, | |||
1771 | 1771 | ||
1772 | #ifdef CONFIG_ISA_DMA_API | 1772 | #ifdef CONFIG_ISA_DMA_API |
1773 | /* utility function that suggests a dma transfer size in bytes */ | 1773 | /* utility function that suggests a dma transfer size in bytes */ |
1774 | static unsigned int labpc_suggest_transfer_size(struct comedi_cmd cmd) | 1774 | static unsigned int labpc_suggest_transfer_size(const struct comedi_cmd *cmd) |
1775 | { | 1775 | { |
1776 | unsigned int size; | 1776 | unsigned int size; |
1777 | unsigned int freq; | 1777 | unsigned int freq; |
1778 | 1778 | ||
1779 | if (cmd.convert_src == TRIG_TIMER) | 1779 | if (cmd->convert_src == TRIG_TIMER) |
1780 | freq = 1000000000 / cmd.convert_arg; | 1780 | freq = 1000000000 / cmd->convert_arg; |
1781 | /* return some default value */ | 1781 | /* return some default value */ |
1782 | else | 1782 | else |
1783 | freq = 0xffffffff; | 1783 | freq = 0xffffffff; |