]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
staging: speakup: cleanup spk_var_header_by_name()
authorDan Carpenter <dan.carpenter@oracle.com>
Thu, 9 May 2013 18:31:59 +0000 (21:31 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 13 May 2013 22:02:29 +0000 (18:02 -0400)
There is a confusing while loop here and I have re-written it in
canonical for loop format.  Also I reversed the NULL check on "name" and
pulled everything in one tab stop.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/speakup/varhandlers.c

index 7f6288fc2299b91dbecc653d763ca7006ec6b8ca..2e8603d7b14a48273d381c37ca2468cd19996ff3 100644 (file)
@@ -137,18 +137,15 @@ struct st_var_header *spk_get_var_header(enum var_id_t var_id)
 struct st_var_header *spk_var_header_by_name(const char *name)
 {
        int i;
-       struct st_var_header *where = NULL;
 
-       if (name != NULL) {
-               i = 0;
-               while ((i < MAXVARS) && (where == NULL)) {
-                       if (strcmp(name, var_ptrs[i]->name) == 0)
-                               where = var_ptrs[i];
-                       else
-                               i++;
-               }
+       if (!name)
+               return NULL;
+
+       for (i = 0; i < MAXVARS; i++) {
+               if (strcmp(name, var_ptrs[i]->name) == 0)
+                       return var_ptrs[i];
        }
-       return where;
+       return NULL;
 }
 
 struct var_t *spk_get_var(enum var_id_t var_id)