From d1a600e986062f6c467a3501247e34849c21aa76 Mon Sep 17 00:00:00 2001
From: Peter Huewe <peterhuewe@gmx.de>
Date: Sun, 3 Feb 2013 22:54:35 +0100
Subject: [PATCH] --- yaml --- r: 354355 b: refs/heads/master c:
 bae31702cdc0db3d45d05aa6e073641c85918c50 h: refs/heads/master i:   354353:
 08ff26c1df692df7b6c61151aee770ea47477b7d   354351:
 e7496253f261acf9766931cb31034e00f99af7ce v: v3

---
 [refs]                                    |  2 +-
 trunk/drivers/staging/xgifb/XGI_main_26.c | 16 ++--------------
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index af4524f30620..97983d257557 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 76a5899b0ceeaeda7b457b7f55cd258bc0c49c34
+refs/heads/master: bae31702cdc0db3d45d05aa6e073641c85918c50
diff --git a/trunk/drivers/staging/xgifb/XGI_main_26.c b/trunk/drivers/staging/xgifb/XGI_main_26.c
index 106abc8d9cbb..840b49773285 100644
--- a/trunk/drivers/staging/xgifb/XGI_main_26.c
+++ b/trunk/drivers/staging/xgifb/XGI_main_26.c
@@ -1131,22 +1131,10 @@ static int XGIfb_release(struct fb_info *info, int user)
 	return 0;
 }
 
+/* similar to sisfb_get_cmap_len */
 static int XGIfb_get_cmap_len(const struct fb_var_screeninfo *var)
 {
-	int rc = 16;
-
-	switch (var->bits_per_pixel) {
-	case 8:
-		rc = 256;
-		break;
-	case 16:
-		rc = 16;
-		break;
-	case 32:
-		rc = 16;
-		break;
-	}
-	return rc;
+	return (var->bits_per_pixel == 8) ? 256 : 16;
 }
 
 static int XGIfb_setcolreg(unsigned regno, unsigned red, unsigned green,