summaryrefslogtreecommitdiffstats
path: root/drivers/staging/comedi/drivers.c
diff options
context:
space:
mode:
authorH Hartley Sweeten <hsweeten@visionengravers.com>2014-10-31 12:04:28 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-11-03 16:34:17 -0800
commitc39e050d21d107d26183be0f22b89eccccdbe61c (patch)
tree968e6e76a074f75380f7e28e7f5306f42740e1ac /drivers/staging/comedi/drivers.c
parent272fe8f51fd8b8cd1637c8d2ca868cbff725405e (diff)
downloadop-kernel-dev-c39e050d21d107d26183be0f22b89eccccdbe61c.zip
op-kernel-dev-c39e050d21d107d26183be0f22b89eccccdbe61c.tar.gz
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/drivers.c')
-rw-r--r--drivers/staging/comedi/drivers.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/comedi/drivers.c b/drivers/staging/comedi/drivers.c
index 9c55dc7..9a8c5fc 100644
--- a/drivers/staging/comedi/drivers.c
+++ b/drivers/staging/comedi/drivers.c
@@ -316,14 +316,14 @@ unsigned int comedi_bytes_per_scan(struct comedi_subdevice *s)
case COMEDI_SUBD_DI:
case COMEDI_SUBD_DO:
case COMEDI_SUBD_DIO:
- bits_per_sample = 8 * bytes_per_sample(s);
+ bits_per_sample = 8 * comedi_bytes_per_sample(s);
num_samples = DIV_ROUND_UP(cmd->chanlist_len, bits_per_sample);
break;
default:
num_samples = cmd->chanlist_len;
break;
}
- return num_samples * bytes_per_sample(s);
+ return comedi_samples_to_bytes(s, num_samples);
}
EXPORT_SYMBOL_GPL(comedi_bytes_per_scan);
OpenPOWER on IntegriCloud