openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Ian Abbott 2012-09-19 19:37:42 +01:00 committed by Greg Kroah-Hartman
parent eb4332eff5
commit 62fea8c8f1
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/staging/comedi/drivers/ni_labpc.c
View File

@ -246,7 +246,7 @@ static int labpc_eeprom_write_insn(struct comedi_device *dev,
static void labpc_adc_timing(struct comedi_device *dev, struct comedi_cmd *cmd, static void labpc_adc_timing(struct comedi_device *dev, struct comedi_cmd *cmd,
enum scan_mode scan_mode); enum scan_mode scan_mode);
#ifdef CONFIG_ISA_DMA_API #ifdef CONFIG_ISA_DMA_API
static unsigned int labpc_suggest_transfer_size(struct comedi_cmd cmd); static unsigned int labpc_suggest_transfer_size(const struct comedi_cmd *cmd);
#endif #endif
static int labpc_dio_mem_callback(int dir, int port, int data, static int labpc_dio_mem_callback(int dir, int port, int data,
unsigned long arg); unsigned long arg);
@ -1318,7 +1318,7 @@ static int labpc_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
set_dma_addr(devpriv->dma_chan, set_dma_addr(devpriv->dma_chan,
virt_to_bus(devpriv->dma_buffer)); virt_to_bus(devpriv->dma_buffer));
/* set appropriate size of transfer */ /* set appropriate size of transfer */
devpriv->dma_transfer_size = labpc_suggest_transfer_size(*cmd); devpriv->dma_transfer_size = labpc_suggest_transfer_size(cmd);
if (cmd->stop_src == TRIG_COUNT && if (cmd->stop_src == TRIG_COUNT &&
devpriv->count * sample_size < devpriv->dma_transfer_size) { devpriv->count * sample_size < devpriv->dma_transfer_size) {
devpriv->dma_transfer_size = devpriv->dma_transfer_size =
@ -1771,13 +1771,13 @@ static int labpc_eeprom_write_insn(struct comedi_device *dev,
#ifdef CONFIG_ISA_DMA_API #ifdef CONFIG_ISA_DMA_API
/* utility function that suggests a dma transfer size in bytes */ /* utility function that suggests a dma transfer size in bytes */
static unsigned int labpc_suggest_transfer_size(struct comedi_cmd cmd) static unsigned int labpc_suggest_transfer_size(const struct comedi_cmd *cmd)
{ {
unsigned int size; unsigned int size;
unsigned int freq; unsigned int freq;
if (cmd.convert_src == TRIG_TIMER) if (cmd->convert_src == TRIG_TIMER)
freq = 1000000000 / cmd.convert_arg; freq = 1000000000 / cmd->convert_arg;
/* return some default value */ /* return some default value */
else else
freq = 0xffffffff; freq = 0xffffffff;