瀏覽代碼

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>
Joo Aun Saw 10 年之前
父節點
當前提交
95ddd3f4b1
共有 2 個文件被更改,包括 7 次插入7 次删除
  1. 6 6
      tools/iio/iio_utils.c
  2. 1 1
      tools/iio/iio_utils.h

+ 6 - 6
tools/iio/iio_utils.c

@@ -286,17 +286,17 @@ error_free_builtname:
  * @cnt: the amount of array elements
  * @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;
 	struct iio_channel_info temp;
 	int x, y;
 	int x, y;
 
 
 	for (x = 0; x < cnt; x++)
 	for (x = 0; x < cnt; x++)
 		for (y = 0; y < (cnt - 1); y++)
 		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);
 	free(scan_el_dir);
 	/* reorder so that the array is in index order */
 	/* 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;
 	return 0;
 
 

+ 1 - 1
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,
 int iioutils_get_param_float(float *output, const char *param_name,
 			     const char *device_dir, const char *name,
 			     const char *device_dir, const char *name,
 			     const char *generic_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,
 int build_channel_array(const char *device_dir,
 			struct iio_channel_info **ci_array, int *counter);
 			struct iio_channel_info **ci_array, int *counter);
 int find_type_by_name(const char *name, const char *type);
 int find_type_by_name(const char *name, const char *type);