staging/xgifb: Consolidate return paths
authorPeter Huewe <peterhuewe@gmx.de>
Fri, 15 Feb 2013 19:37:12 +0000 (20:37 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 15 Feb 2013 23:12:40 +0000 (15:12 -0800)
Both branches of this if statement end in the same return statement.
-> move the return to the bottom and get rid of the else statement.

Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/xgifb/vb_setmode.c

index a602d435ca01b645c7218dbb69742adbfe24cee7..edbe70ba1a91d83ec8e2c06730b1758d06583875 100644 (file)
@@ -2860,10 +2860,8 @@ static unsigned short XGI_GetOffset(unsigned short ModeNo,
                temp = 0x6B;
                if (infoflag & InterlaceMode)
                        temp = temp << 1;
-               return temp * colordepth;
-       } else {
-               return temp * colordepth;
        }
+       return temp * colordepth;
 }
 
 static void XGI_SetCRT2Offset(unsigned short ModeNo,