summaryrefslogtreecommitdiff
path: root/drivers/staging/xgifb
diff options
context:
space:
mode:
authorAaro Koskinen <aaro.koskinen@iki.fi>2011-10-11 18:47:28 (GMT)
committerGreg Kroah-Hartman <gregkh@suse.de>2011-10-12 15:51:47 (GMT)
commit84a6c46eb2d4aac843d6946bf8319dfe78a35f96 (patch)
tree4d99fae3304249ba5f5d2b544c2a55a394be046c /drivers/staging/xgifb
parentc11d0ef3e250a4483e10e6984362b07fbf12c5ae (diff)
downloadlinux-84a6c46eb2d4aac843d6946bf8319dfe78a35f96.tar.xz
staging: xgifb: eliminate filter_tb global variable
filter_tb is only used inside a single function, and it does not need to be static. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/xgifb')
-rw-r--r--drivers/staging/xgifb/XGI_main.h1
-rw-r--r--drivers/staging/xgifb/XGI_main_26.c3
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/staging/xgifb/XGI_main.h b/drivers/staging/xgifb/XGI_main.h
index 1d0949c..78f4c93 100644
--- a/drivers/staging/xgifb/XGI_main.h
+++ b/drivers/staging/xgifb/XGI_main.h
@@ -565,6 +565,5 @@ static const struct _XGI_TV_filter {
};
static int filter = -1;
-static unsigned char filter_tb;
#endif
diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c
index ba7f096..bbbcdb7 100644
--- a/drivers/staging/xgifb/XGI_main_26.c
+++ b/drivers/staging/xgifb/XGI_main_26.c
@@ -946,6 +946,8 @@ static void XGIfb_post_setmode(struct xgifb_video_info *xgifb_info)
reg = xgifb_reg_get(XGIPART4, 0x01);
if (reg < 0xB0) { /* Set filter for XGI301 */
+ int filter_tb;
+
switch (xgifb_info->video_width) {
case 320:
filter_tb = (xgifb_info->TV_type ==
@@ -964,6 +966,7 @@ static void XGIfb_post_setmode(struct xgifb_video_info *xgifb_info)
TVMODE_NTSC) ? 7 : 15;
break;
default:
+ filter_tb = 0;
filter = -1;
break;
}