diff options
| author | Joo Aun Saw <jasaw@dius.com.au> | 2015-07-24 17:23:29 +0200 |
|---|---|---|
| committer | Jonathan Cameron <jic23@kernel.org> | 2015-08-08 20:54:00 +0200 |
| commit | 95ddd3f4b17e1df20b5e23d7b81614e7c8a643da (patch) | |
| tree | 5635b52796aa2fd9973c3269b212bd4d54eb8c05 /tools/iio | |
| parent | tools: iio: Set caller's ci_array pointer to NULL after free (diff) | |
| download | linux-95ddd3f4b17e1df20b5e23d7b81614e7c8a643da.tar.xz linux-95ddd3f4b17e1df20b5e23d7b81614e7c8a643da.zip | |
tools: iio: remove unnecessary double pointer
Remove unnecessary double pointer from channel sorting function.
Signed-off-by: Joo Aun Saw <jasaw@dius.com.au>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Diffstat (limited to 'tools/iio')
| -rw-r--r-- | tools/iio/iio_utils.c | 12 | ||||
| -rw-r--r-- | tools/iio/iio_utils.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/tools/iio/iio_utils.c b/tools/iio/iio_utils.c index 8475b832ee39..5eb6793f3972 100644 --- a/tools/iio/iio_utils.c +++ b/tools/iio/iio_utils.c @@ -286,17 +286,17 @@ error_free_builtname: * @cnt: the amount of array elements **/ -void bsort_channel_array_by_index(struct iio_channel_info **ci_array, int cnt) +void bsort_channel_array_by_index(struct iio_channel_info *ci_array, int cnt) { struct iio_channel_info temp; int x, y; for (x = 0; x < cnt; x++) for (y = 0; y < (cnt - 1); y++) - if ((*ci_array)[y].index > (*ci_array)[y + 1].index) { - temp = (*ci_array)[y + 1]; - (*ci_array)[y + 1] = (*ci_array)[y]; - (*ci_array)[y] = temp; + if (ci_array[y].index > ci_array[y + 1].index) { + temp = ci_array[y + 1]; + ci_array[y + 1] = ci_array[y]; + ci_array[y] = temp; } } @@ -516,7 +516,7 @@ int build_channel_array(const char *device_dir, free(scan_el_dir); /* reorder so that the array is in index order */ - bsort_channel_array_by_index(ci_array, *counter); + bsort_channel_array_by_index(*ci_array, *counter); return 0; diff --git a/tools/iio/iio_utils.h b/tools/iio/iio_utils.h index f30a1091b53e..e3503bfe538b 100644 --- a/tools/iio/iio_utils.h +++ b/tools/iio/iio_utils.h @@ -60,7 +60,7 @@ int iioutils_get_type(unsigned *is_signed, unsigned *bytes, unsigned *bits_used, int iioutils_get_param_float(float *output, const char *param_name, const char *device_dir, const char *name, const char *generic_name); -void bsort_channel_array_by_index(struct iio_channel_info **ci_array, int cnt); +void bsort_channel_array_by_index(struct iio_channel_info *ci_array, int cnt); int build_channel_array(const char *device_dir, struct iio_channel_info **ci_array, int *counter); int find_type_by_name(const char *name, const char *type); |