From: Lars-Peter Clausen Date: Thu, 17 Jul 2014 15:59:00 +0000 (+0100) Subject: iio: buffer: Use roundup() instead of open-coding it X-Git-Tag: v3.18-rc1~130^2~1187^2~24 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=61072dbc8a017039059ec0e94548e4ba31602893;p=karo-tx-linux.git iio: buffer: Use roundup() instead of open-coding it Makes the code slightly shorter and a bit easier to understand. Signed-off-by: Lars-Peter Clausen Signed-off-by: Jonathan Cameron --- diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c index 2952ee038477..7462f1233974 100644 --- a/drivers/iio/industrialio-buffer.c +++ b/drivers/iio/industrialio-buffer.c @@ -979,9 +979,7 @@ static int iio_buffer_update_demux(struct iio_dev *indio_dev, else length = ch->scan_type.storagebits / 8; /* Make sure we are aligned */ - in_loc += length; - if (in_loc % length) - in_loc += length - in_loc % length; + in_loc = roundup(in_loc, length) + length; } p = kmalloc(sizeof(*p), GFP_KERNEL); if (p == NULL) { @@ -994,10 +992,8 @@ static int iio_buffer_update_demux(struct iio_dev *indio_dev, ch->scan_type.repeat; else length = ch->scan_type.storagebits / 8; - if (out_loc % length) - out_loc += length - out_loc % length; - if (in_loc % length) - in_loc += length - in_loc % length; + out_loc = roundup(out_loc, length); + in_loc = roundup(in_loc, length); p->from = in_loc; p->to = out_loc; p->length = length; @@ -1019,10 +1015,8 @@ static int iio_buffer_update_demux(struct iio_dev *indio_dev, ch->scan_type.repeat; else length = ch->scan_type.storagebits / 8; - if (out_loc % length) - out_loc += length - out_loc % length; - if (in_loc % length) - in_loc += length - in_loc % length; + out_loc = roundup(out_loc, length); + in_loc = roundup(in_loc, length); p->from = in_loc; p->to = out_loc; p->length = length;