aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaro Koskinen <aaro.koskinen@iki.fi>2011-10-11 14:47:28 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2011-10-12 11:51:47 -0400
commit84a6c46eb2d4aac843d6946bf8319dfe78a35f96 (patch)
tree4d99fae3304249ba5f5d2b544c2a55a394be046c
parentc11d0ef3e250a4483e10e6984362b07fbf12c5ae (diff)
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>
-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 1d0949c98c3..78f4c934b24 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 {
565}; 565};
566 566
567static int filter = -1; 567static int filter = -1;
568static unsigned char filter_tb;
569 568
570#endif 569#endif
diff --git a/drivers/staging/xgifb/XGI_main_26.c b/drivers/staging/xgifb/XGI_main_26.c
index ba7f09630d2..bbbcdb7e50e 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)
946 reg = xgifb_reg_get(XGIPART4, 0x01); 946 reg = xgifb_reg_get(XGIPART4, 0x01);
947 947
948 if (reg < 0xB0) { /* Set filter for XGI301 */ 948 if (reg < 0xB0) { /* Set filter for XGI301 */
949 int filter_tb;
950
949 switch (xgifb_info->video_width) { 951 switch (xgifb_info->video_width) {
950 case 320: 952 case 320:
951 filter_tb = (xgifb_info->TV_type == 953 filter_tb = (xgifb_info->TV_type ==
@@ -964,6 +966,7 @@ static void XGIfb_post_setmode(struct xgifb_video_info *xgifb_info)
964 TVMODE_NTSC) ? 7 : 15; 966 TVMODE_NTSC) ? 7 : 15;
965 break; 967 break;
966 default: 968 default:
969 filter_tb = 0;
967 filter = -1; 970 filter = -1;
968 break; 971 break;
969 } 972 }