1 files changed, 29 insertions, 26 deletions

diff --git a/tools/iio/lsiio.c b/tools/iio/lsiio.c
index b59ee1733924..3d650e668252 100644
--- a/tools/iio/lsiio.c
+++ b/tools/iio/lsiio.c
@@ -20,7 +20,6 @@
 #include <sys/dir.h>
 #include "iio_utils.h"
 
-
 static enum verbosity {
         VERBLEVEL_DEFAULT,      /* 0 gives lspci behaviour */
         VERBLEVEL_SENSORS,      /* 1 lists sensors */
@@ -29,17 +28,16 @@ static enum verbosity {
 const char *type_device = "iio:device";
 const char *type_trigger = "trigger";
 
-
 static inline int check_prefix(const char *str, const char *prefix)
 {
         return strlen(str) > strlen(prefix) &&
-                strncmp(str, prefix, strlen(prefix)) == 0;
+               strncmp(str, prefix, strlen(prefix)) == 0;
 }
 
 static inline int check_postfix(const char *str, const char *postfix)
 {
         return strlen(str) > strlen(postfix) &&
-                strcmp(str + strlen(str) - strlen(postfix), postfix) == 0;
+               strcmp(str + strlen(str) - strlen(postfix), postfix) == 0;
 }
 
 static int dump_channels(const char *dev_dir_name)
@@ -48,13 +46,13 @@ static int dump_channels(const char *dev_dir_name)
         const struct dirent *ent;
 
         dp = opendir(dev_dir_name);
-        if (dp == NULL)
+        if (!dp)
                 return -errno;
-        while (ent = readdir(dp), ent != NULL)
+
+        while (ent = readdir(dp), ent)
                 if (check_prefix(ent->d_name, "in_") &&
-                    check_postfix(ent->d_name, "_raw")) {
+                    check_postfix(ent->d_name, "_raw"))
                         printf("   %-10s\n", ent->d_name);
-                }
 
         return (closedir(dp) == -1) ? -errno : 0;
 }
@@ -63,20 +61,22 @@ static int dump_one_device(const char *dev_dir_name)
 {
         char name[IIO_MAX_NAME_LENGTH];
         int dev_idx;
-        int retval;
+        int ret;
 
-        retval = sscanf(dev_dir_name + strlen(iio_dir) + strlen(type_device),
-                        "%i", &dev_idx);
-        if (retval != 1)
+        ret = sscanf(dev_dir_name + strlen(iio_dir) + strlen(type_device), "%i",
+                     &dev_idx);
+        if (ret != 1)
                 return -EINVAL;
-        retval = read_sysfs_string("name", dev_dir_name, name);
-        if (retval)
-                return retval;
+
+        ret = read_sysfs_string("name", dev_dir_name, name);
+        if (ret < 0)
+                return ret;
 
         printf("Device %03d: %s\n", dev_idx, name);
 
         if (verblevel >= VERBLEVEL_SENSORS)
                 return dump_channels(dev_dir_name);
+
         return 0;
 }
 
@@ -84,17 +84,19 @@ static int dump_one_trigger(const char *dev_dir_name)
 {
         char name[IIO_MAX_NAME_LENGTH];
         int dev_idx;
-        int retval;
+        int ret;
 
-        retval = sscanf(dev_dir_name + strlen(iio_dir) + strlen(type_trigger),
-                        "%i", &dev_idx);
-        if (retval != 1)
+        ret = sscanf(dev_dir_name + strlen(iio_dir) + strlen(type_trigger),
+                     "%i", &dev_idx);
+        if (ret != 1)
                 return -EINVAL;
-        retval = read_sysfs_string("name", dev_dir_name, name);
-        if (retval)
-                return retval;
+
+        ret = read_sysfs_string("name", dev_dir_name, name);
+        if (ret < 0)
+                return ret;
 
         printf("Trigger %03d: %s\n", dev_idx, name);
+
         return 0;
 }
 
@@ -105,12 +107,12 @@ static int dump_devices(void)
         DIR *dp;
 
         dp = opendir(iio_dir);
-        if (dp == NULL) {
-                printf("No industrial I/O devices available\n");
+        if (!dp) {
+                fprintf(stderr, "No industrial I/O devices available\n");
                 return -ENODEV;
         }
 
-        while (ent = readdir(dp), ent != NULL) {
+        while (ent = readdir(dp), ent) {
                 if (check_prefix(ent->d_name, type_device)) {
                         char *dev_dir_name;
 
@@ -132,7 +134,7 @@ static int dump_devices(void)
                 }
         }
         rewinddir(dp);
-        while (ent = readdir(dp), ent != NULL) {
+        while (ent = readdir(dp), ent) {
                 if (check_prefix(ent->d_name, type_trigger)) {
                         char *dev_dir_name;
 
@@ -151,6 +153,7 @@ static int dump_devices(void)
                         free(dev_dir_name);
                 }
         }
+
         return (closedir(dp) == -1) ? -errno : 0;
 
 error_close_dir: