From: H Hartley Sweeten Date: Fri, 31 Oct 2014 19:04:31 +0000 (-0700) Subject: staging: comedi: das16: use sample manipulation helpers X-Git-Tag: firefly_0821_release~176^2~2665^2~456 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=bd508fffda8fc3dbcabab9bc31817c588f7938c2;p=firefly-linux-kernel-4.4.55.git staging: comedi: das16: use sample manipulation helpers Use the recently added sample manipulation helpers to remove the hardcoded assumption of the sample size. Signed-off-by: H Hartley Sweeten Reviewed-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/comedi/drivers/das16.c b/drivers/staging/comedi/drivers/das16.c index 26f54aa9d41c..8de27053666f 100644 --- a/drivers/staging/comedi/drivers/das16.c +++ b/drivers/staging/comedi/drivers/das16.c @@ -863,8 +863,9 @@ static void das16_ai_munge(struct comedi_device *dev, unsigned int num_bytes, unsigned int start_chan_index) { - unsigned int i, num_samples = num_bytes / sizeof(short); unsigned short *data = array; + unsigned int num_samples = comedi_bytes_to_samples(s, num_bytes); + unsigned int i; for (i = 0; i < num_samples; i++) { data[i] = le16_to_cpu(data[i]);