From a58c17aeb44c13a26aefc63953c9e6cd7d14f934 Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Wed, 19 Sep 2012 19:37:42 +0100 Subject: [PATCH] --- yaml --- r: 325481 b: refs/heads/master c: 62fea8c8f1bf5ca33ba55b3f421d9598a68297ee h: refs/heads/master i: 325479: 02b9aec10fb5fc3d212e9f83768192bafc3643bf v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/ni_labpc.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index abd76ab573a2..7e7d63174274 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eb4332eff5aa071b19f89f45ae7f6393af59ba62 +refs/heads/master: 62fea8c8f1bf5ca33ba55b3f421d9598a68297ee diff --git a/trunk/drivers/staging/comedi/drivers/ni_labpc.c b/trunk/drivers/staging/comedi/drivers/ni_labpc.c index 200099e4c220..d534e63d886e 100644 --- a/trunk/drivers/staging/comedi/drivers/ni_labpc.c +++ b/trunk/drivers/staging/comedi/drivers/ni_labpc.c @@ -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;