diff options
author | Peter Huewe <peterhuewe@gmx.de> | 2013-02-15 14:37:12 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-02-15 18:12:40 -0500 |
commit | 053004b375ca8f684f778d354eeeaf4e8b17c1f0 (patch) | |
tree | e3e537daf267a16501dcd00406ac25d9eb24113d | |
parent | 516354e0b458c3c16555364e105bdee5cd1cf5f1 (diff) |
staging/xgifb: Consolidate return paths
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>
-rw-r--r-- | drivers/staging/xgifb/vb_setmode.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c index a602d435ca01..edbe70ba1a91 100644 --- a/drivers/staging/xgifb/vb_setmode.c +++ b/drivers/staging/xgifb/vb_setmode.c | |||
@@ -2860,10 +2860,8 @@ static unsigned short XGI_GetOffset(unsigned short ModeNo, | |||
2860 | temp = 0x6B; | 2860 | temp = 0x6B; |
2861 | if (infoflag & InterlaceMode) | 2861 | if (infoflag & InterlaceMode) |
2862 | temp = temp << 1; | 2862 | temp = temp << 1; |
2863 | return temp * colordepth; | ||
2864 | } else { | ||
2865 | return temp * colordepth; | ||
2866 | } | 2863 | } |
2864 | return temp * colordepth; | ||
2867 | } | 2865 | } |
2868 | 2866 | ||
2869 | static void XGI_SetCRT2Offset(unsigned short ModeNo, | 2867 | static void XGI_SetCRT2Offset(unsigned short ModeNo, |