From: Peter Huewe Date: Sun, 3 Feb 2013 21:54:35 +0000 (+0100) Subject: staging/xgifb: rewrite XGIfb_get_cmap_len X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=bae31702cdc0db3d45d05aa6e073641c85918c50;p=deliverable%2Flinux.git staging/xgifb: rewrite XGIfb_get_cmap_len We don't need to use this switch-case here for a simple two case if-else. Signed-off-by: Peter Huewe Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c index 106abc8d9cbb..840b49773285 100644 --- a/drivers/staging/xgifb/XGI_main_26.c +++ b/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,