aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging
diff options
context:
space:
mode:
authorPeter Huewe <peterhuewe@gmx.de>2013-02-15 20:37:12 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-02-15 15:12:40 -0800
commit053004b375ca8f684f778d354eeeaf4e8b17c1f0 (patch)
treee3e537daf267a16501dcd00406ac25d9eb24113d /drivers/staging
parent516354e0b458c3c16555364e105bdee5cd1cf5f1 (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>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/xgifb/vb_setmode.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c
index a602d435ca0..edbe70ba1a9 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,
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,