leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iio: core: Simplify iio_format_list()

Browse Source 
iio_format_list() has two branches in a switch statement that are almost
identical. They only differ in the stride that is used to iterate through
the item list.

Consolidate this into a common code path to simplify the code.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Link: https://lore.kernel.org/r/20201114120000.6533-2-lars@metafoo.de
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
This commit is contained in:
Lars-Peter Clausen
2020-11-14 13:00:00 +01:00
committed by Jonathan Cameron
parent eda20ba1e2
commit e08b60d352
1 changed files with 18 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
drivers/iio/industrialio-core.c
View File

@@ -715,44 +715,35 @@ static ssize_t iio_format_list(char *buf, const int *vals, int type, int length,
const char *prefix, const char *suffix) const char *prefix, const char *suffix)
{ {
ssize_t len; ssize_t len;
int stride;
int i; int i;
len = scnprintf(buf, PAGE_SIZE, prefix);
switch (type) { switch (type) {
case IIO_VAL_INT: case IIO_VAL_INT:
for (i = 0; i < length; i++) { stride = 1;
len += __iio_format_value(buf + len, PAGE_SIZE - len,
type, 1, &vals[i]);
if (len >= PAGE_SIZE)
return -EFBIG;
if (i < length - 1)
len += scnprintf(buf + len, PAGE_SIZE - len,
" ");
else
len += scnprintf(buf + len, PAGE_SIZE - len,
"%s\n", suffix);
if (len >= PAGE_SIZE)
return -EFBIG;
}
break; break;
default: default:
for (i = 0; i < length / 2; i++) { stride = 2;
len += __iio_format_value(buf + len, PAGE_SIZE - len, break;
type, 2, &vals[i * 2]); }
if (len >= PAGE_SIZE)
return -EFBIG; len = scnprintf(buf, PAGE_SIZE, prefix);
if (i < length / 2 - 1)
len += scnprintf(buf + len, PAGE_SIZE - len, for (i = 0; i <= length - stride; i += stride) {
" "); if (i != 0) {
else len += scnprintf(buf + len, PAGE_SIZE - len, " ");
len += scnprintf(buf + len, PAGE_SIZE - len,
"%s\n", suffix);
if (len >= PAGE_SIZE) if (len >= PAGE_SIZE)
return -EFBIG; return -EFBIG;
} }
len += __iio_format_value(buf + len, PAGE_SIZE - len, type,
stride, &vals[i]);
if (len >= PAGE_SIZE)
return -EFBIG;
} }
len += scnprintf(buf + len, PAGE_SIZE - len, "%s\n", suffix);
return len; return len;
} }