Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-30 14:52:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

staging: comedi: adl_pci9111: use sample manipulation helpers

Browse Source 
Use the recently added sample manipulation helpers to remove the hardcoded
assumption of the sample size.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2014-10-31 12:04:34 -07:00 committed by Greg Kroah-Hartman
parent 1d3d32a752
commit 287a143ab4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/staging/comedi/drivers/adl_pci9111.c
View File

@ -452,7 +452,7 @@ static void pci9111_ai_munge(struct comedi_device *dev,
unsigned int maxdata = s->maxdata;
unsigned int invert = (maxdata + 1) >> 1;
unsigned int shift = (maxdata == 0xffff) ? 0 : 4;
unsigned int num_samples = num_bytes / sizeof(short);
unsigned int num_samples = comedi_bytes_to_samples(s, num_bytes);
unsigned int i;
for (i = 0; i < num_samples; i++)
@ -501,7 +501,7 @@ static void pci9111_handle_fifo_half_full(struct comedi_device *dev,
if (to_read > samples - pos)
to_read = samples - pos;
total += to_read * sizeof(short);
total += comedi_samples_to_bytes(s, to_read);
}
pos += to_read;
@ -513,7 +513,7 @@ static void pci9111_handle_fifo_half_full(struct comedi_device *dev,
}
}
devpriv->stop_counter -= total / sizeof(short);
devpriv->stop_counter -= comedi_bytes_to_samples(s, total);
}
static irqreturn_t pci9111_interrupt(int irq, void *p_device)