]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: unisys: refactor find_dev()
authorBenjamin Romer <benjamin.romer@unisys.com>
Fri, 5 Dec 2014 22:09:02 +0000 (17:09 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 10 Jan 2015 01:32:33 +0000 (17:32 -0800)
Fix the function definition so that it is a single line. Fix CamelCase
parameter names:

busNo => bus_no
devNo => dev_no

Get rid of the goto and just break out of the for loop, since that does
the exact same thing.

Signed-off-by: Bryan Thompson <bryan.thompson@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/unisys/uislib/uislib.c

index 614919c88edda221e7c52a13c5830496f242213a..908ec497db54010a0e9f2d5362d8623d764859e6 100644 (file)
@@ -1187,31 +1187,29 @@ static ssize_t info_debugfs_read(struct file *file, char __user *buf,
                                       debug_buf, total_bytes);
 }
 
-static struct device_info *
-find_dev(u32 busNo, u32 devNo)
+static struct device_info *find_dev(u32 bus_no, u32 dev_no)
 {
        struct bus_info *bus;
        struct device_info *dev = NULL;
 
        read_lock(&bus_list_lock);
        for (bus = bus_list; bus; bus = bus->next) {
-               if (bus->bus_no == busNo) {
+               if (bus->bus_no == bus_no) {
                        /* make sure the device number is valid */
-                       if (devNo >= bus->device_count) {
-                               LOGERR("%s bad busNo, devNo=%d,%d",
+                       if (dev_no >= bus->device_count) {
+                               LOGERR("%s bad bus_no, dev_no=%d,%d",
                                       __func__,
-                                      (int)(busNo), (int)(devNo));
-                               goto Away;
+                                      (int)bus_no, (int)dev_no);
+                               break;
                        }
-                       dev = bus->device[devNo];
+                       dev = bus->device[dev_no];
                        if (!dev)
-                               LOGERR("%s bad busNo, devNo=%d,%d",
+                               LOGERR("%s bad bus_no, dev_no=%d,%d",
                                       __func__,
-                                      (int)(busNo), (int)(devNo));
-                       goto Away;
+                                      (int)bus_no, (int)dev_no);
+                       break;
                }
        }
-Away:
        read_unlock(&bus_list_lock);
        return dev;
 }