summaryrefslogtreecommitdiffstats
path: root/drivers/staging/comedi/comedi_fops.c
diff options
context:
space:
mode:
authorH Hartley Sweeten2014-10-31 20:04:28 +0100
committerGreg Kroah-Hartman2014-11-04 01:34:17 +0100
commitc39e050d21d107d26183be0f22b89eccccdbe61c (patch)
tree968e6e76a074f75380f7e28e7f5306f42740e1ac /drivers/staging/comedi/comedi_fops.c
parentstaging: comedi: amplc_pci230: remove private data 'ai_scan_pos' (diff)
downloadkernel-qcow2-linux-c39e050d21d107d26183be0f22b89eccccdbe61c.tar.gz
kernel-qcow2-linux-c39e050d21d107d26183be0f22b89eccccdbe61c.tar.xz
kernel-qcow2-linux-c39e050d21d107d26183be0f22b89eccccdbe61c.zip
staging: comedi: remove use of 'bytes_per_sample()'
This inline helper function has been replaced with comedi_bytes_per_sample(). The same commit (bf33eb4b4f57) introduced a couple other related helper functions a manipulate the sample size. Use the new helper functions to remove the use of 'bytes_per_sample()' and remove it. 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>
Diffstat (limited to 'drivers/staging/comedi/comedi_fops.c')
-rw-r--r--drivers/staging/comedi/comedi_fops.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
index 704ae25c5710..65894fd8b67b 100644
--- a/drivers/staging/comedi/comedi_fops.c
+++ b/drivers/staging/comedi/comedi_fops.c
@@ -2024,7 +2024,7 @@ static unsigned int comedi_poll(struct file *file, poll_table *wait)
s = comedi_write_subdevice(dev, minor);
if (s && s->async) {
- unsigned int bps = bytes_per_sample(s);
+ unsigned int bps = comedi_bytes_per_sample(s);
poll_wait(file, &s->async->wait_head, wait);
comedi_buf_write_alloc(s, s->async->prealloc_bufsz);