evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

iio: buffer: Use roundup() instead of open-coding it

Browse source 
Makes the code slightly shorter and a bit easier to understand.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
This commit is contained in:
Lars-Peter Clausen 2014-07-17 16:59:00 +01:00 • committed by Jonathan Cameron
parent 7ddebf5429
commit 61072dbc8a
1 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/iio/industrialio-buffer.c
View file

@ -979,9 +979,7 @@ static int iio_buffer_update_demux(struct iio_dev *indio_dev,
else else
length = ch->scan_type.storagebits / 8; length = ch->scan_type.storagebits / 8;
/* Make sure we are aligned */ /* Make sure we are aligned */
in_loc += length; in_loc = roundup(in_loc, length) + length;
if (in_loc % length)
in_loc += length - in_loc % length;
} }
p = kmalloc(sizeof(*p), GFP_KERNEL); p = kmalloc(sizeof(*p), GFP_KERNEL);
if (p == NULL) { if (p == NULL) {
@ -994,10 +992,8 @@ static int iio_buffer_update_demux(struct iio_dev *indio_dev,
ch->scan_type.repeat; ch->scan_type.repeat;
else else
length = ch->scan_type.storagebits / 8; length = ch->scan_type.storagebits / 8;
if (out_loc % length) out_loc = roundup(out_loc, length);
out_loc += length - out_loc % length; in_loc = roundup(in_loc, length);
if (in_loc % length)
in_loc += length - in_loc % length;
p->from = in_loc; p->from = in_loc;
p->to = out_loc; p->to = out_loc;
p->length = length; p->length = length;
@ -1019,10 +1015,8 @@ static int iio_buffer_update_demux(struct iio_dev *indio_dev,
ch->scan_type.repeat; ch->scan_type.repeat;
else else
length = ch->scan_type.storagebits / 8; length = ch->scan_type.storagebits / 8;
if (out_loc % length) out_loc = roundup(out_loc, length);
out_loc += length - out_loc % length; in_loc = roundup(in_loc, length);
if (in_loc % length)
in_loc += length - in_loc % length;
p->from = in_loc; p->from = in_loc;
p->to = out_loc; p->to = out_loc;
p->length = length; p->length = length;