]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Staging: ipack/bridges/tpci200: remove "out" label in tpci200_slot_map_space()
authorMiguel Gómez <magomez@igalia.com>
Thu, 7 Jun 2012 08:24:51 +0000 (10:24 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 9 Jun 2012 15:58:02 +0000 (08:58 -0700)
Remove the "out" label from tpci200_slot_map_space(), as it can directly return
the error code instead of jumping.

Signed-off-by: Miguel Gómez <magomez@igalia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/ipack/bridges/tpci200.c

index 68bcc557cb477ef5c8f10cb975247a1e63f92bfb..7baa28a0caad4fa4be0e4b9162b800dd6378b7f8 100644 (file)
@@ -626,15 +626,11 @@ static int tpci200_slot_map_space(struct ipack_device *dev,
        struct tpci200_board *tpci200;
 
        tpci200 = check_slot(dev);
-       if (tpci200 == NULL) {
-               res = -EINVAL;
-               goto out;
-       }
+       if (tpci200 == NULL)
+               return -EINVAL;
 
-       if (mutex_lock_interruptible(&tpci200->mutex)) {
-               res = -ERESTARTSYS;
-               goto out;
-       }
+       if (mutex_lock_interruptible(&tpci200->mutex))
+               return -ERESTARTSYS;
 
        switch (space) {
        case IPACK_IO_SPACE:
@@ -699,7 +695,6 @@ static int tpci200_slot_map_space(struct ipack_device *dev,
 
 out_unlock:
        mutex_unlock(&tpci200->mutex);
-out:
        return res;
 }