staging: xgifb: delete duplicated TV data tables

Delete redundant TV data tables. Replace as follows:

	XGI_EPLCHTVDataPtr	==> xgifb_chrontel_tv
	XGI_EPLCHTVRegPtr	==> xgifb_chrontel_tv

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/xgifb/vb_setmode.c b/drivers/staging/xgifb/vb_setmode.c
index 1d209292c5f40eaf366a778cb494d8222037fbc1..db8944aa21052310e8384b5b4df412647aed44ab 100644 (file)
--- a/drivers/staging/xgifb/vb_setmode.c
+++ b/drivers/staging/xgifb/vb_setmode.c
@@ -2325,7 +2325,8 @@ static void *XGI_GetTVPtr(unsigned short BX, unsigned short ModeNo,
                tempdi = NULL; /*EPLCHTVCRT1Ptr_V;*/
                break;
        case 2:
-               tempdi = XGI_EPLCHTVDataPtr;
+       case 6:
+               tempdi = xgifb_chrontel_tv;
                break;
        case 3:
                tempdi = NULL;
@@ -2336,9 +2337,6 @@ static void *XGI_GetTVPtr(unsigned short BX, unsigned short ModeNo,
        case 5:
                tempdi = NULL;
                break;
-       case 6:
-               tempdi = XGI_EPLCHTVRegPtr;
-               break;
        default:
                break;
        }

diff --git a/drivers/staging/xgifb/vb_table.h b/drivers/staging/xgifb/vb_table.h
index 1355c0b3bbdb7d4c17759797d9b76c8166eb3903..cb58b2ea7354147d517acb270065bc2bd50c4e5e 100644 (file)
--- a/drivers/staging/xgifb/vb_table.h
+++ b/drivers/staging/xgifb/vb_table.h
@@ -2476,21 +2476,12 @@ static struct XGI330_TVDataTablStruct XGI_TVDataTable[] = {
        {0xffff, 0x0000, 12}  /* END */
 };
 
-/* ;;Chrontel 7017 TV Timing List */
-static struct XGI330_TVDataTablStruct XGI_EPLCHTVDataPtr[] = {
-       {0x0011, 0x0000, 0}, /* XGI_CHTVUNTSCData */
-       {0x0011, 0x0010, 1}, /* XGI_CHTVONTSCData */
-       {0x0011, 0x0001, 2}, /* XGI_CHTVUPALData */
-       {0x0011, 0x0011, 3}, /* XGI_CHTVOPALData */
-       {0xFFFF, 0x0000, 4}
-};
-
-/* ;;Chrontel 7017 TV Reg. List */
-static struct XGI330_TVDataTablStruct XGI_EPLCHTVRegPtr[] = {
-       {0x0011, 0x0000, 0}, /* XGI_CHTVRegUNTSC */
-       {0x0011, 0x0010, 1}, /* XGI_CHTVRegONTSC */
-       {0x0011, 0x0001, 2}, /* XGI_CHTVRegUPAL */
-       {0x0011, 0x0011, 3}, /* XGI_CHTVRegOPAL */
+/* Chrontel 7017 TV List */
+static struct XGI330_TVDataTablStruct xgifb_chrontel_tv[] = {
+       {0x0011, 0x0000, 0}, /* UNTSC */
+       {0x0011, 0x0010, 1}, /* ONTSC */
+       {0x0011, 0x0001, 2}, /* UPAL */
+       {0x0011, 0x0011, 3}, /* OPAL */
        {0xFFFF, 0x0000, 4}
 };