staging: comedi: ni_labpc: don't pass struct comedi_cmd by value
authorIan Abbott <abbotti@mev.co.uk>
Wed, 19 Sep 2012 18:37:42 +0000 (19:37 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 21 Sep 2012 16:29:54 +0000 (09:29 -0700)
`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>
drivers/staging/comedi/drivers/ni_labpc.c

index 200099e4c2204100f9a9de22e299aa3eaddb9826..d534e63d886e03e715be49d8265e3df48f2cbc53 100644 (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,
                             enum scan_mode scan_mode);
 #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
 static int labpc_dio_mem_callback(int dir, int port, int data,
                                  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,
                             virt_to_bus(devpriv->dma_buffer));
                /*  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 &&
                    devpriv->count * sample_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
 /* 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 freq;
 
-       if (cmd.convert_src == TRIG_TIMER)
-               freq = 1000000000 / cmd.convert_arg;
+       if (cmd->convert_src == TRIG_TIMER)
+               freq = 1000000000 / cmd->convert_arg;
        /* return some default value */
        else
                freq = 0xffffffff;