]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
V4L/DVB(7875): mxl5005s: Remove redundant functions
authorSteven Toth <stoth@hauppauge.com>
Sat, 3 May 2008 17:21:58 +0000 (14:21 -0300)
committerMauro Carvalho Chehab <mchehab@infradead.org>
Wed, 14 May 2008 05:56:40 +0000 (02:56 -0300)
Remove redundant functions

Signed-off-by: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
drivers/media/common/tuners/mxl5005s.c

index 96391648871a8953ac7a59be20da774995d2bf4c..786f8daa6de91e4f8d28fca4934585ce9bc63844 100644 (file)
@@ -304,7 +304,6 @@ static u16 MXL_GetCHRegister(struct dvb_frontend *fe, u8 *RegNum,
        u8 *RegVal, int *count);
 static u32 MXL_Ceiling(u32 value, u32 resolution);
 static u16 MXL_RegRead(struct dvb_frontend *fe, u8 RegNum, u8 *RegVal);
-static u16 MXL_RegWrite(struct dvb_frontend *fe, u8 RegNum, u8 RegVal);
 static u16 MXL_ControlWrite_Group(struct dvb_frontend *fe, u16 controlNum,
        u32 value, u16 controlGroup);
 static u16 MXL_SetGPIO(struct dvb_frontend *fe, u8 GPIO_Num, u8 GPIO_Val);
@@ -3492,21 +3491,6 @@ static u16 MXL_ControlWrite_Group(struct dvb_frontend *fe, u16 controlNum,
        return 0 ; /* successful return */
 }
 
-static u16 MXL_RegWrite(struct dvb_frontend *fe, u8 RegNum, u8 RegVal)
-{
-       struct mxl5005s_state *state = fe->tuner_priv;
-       int i ;
-
-       for (i = 0; i < 104; i++) {
-               if (RegNum == state->TunerRegs[i].Reg_Num) {
-                       state->TunerRegs[i].Reg_Val = RegVal;
-                       return 0;
-               }
-       }
-
-       return 1;
-}
-
 static u16 MXL_RegRead(struct dvb_frontend *fe, u8 RegNum, u8 *RegVal)
 {
        struct mxl5005s_state *state = fe->tuner_priv;
@@ -3570,92 +3554,6 @@ static u16 MXL_ControlRead(struct dvb_frontend *fe, u16 controlNum, u32 *value)
        return 1;
 }
 
-static u16 MXL_ControlRegRead(struct dvb_frontend *fe, u16 controlNum,
-       u8 *RegNum, int *count)
-{
-       struct mxl5005s_state *state = fe->tuner_priv;
-       u16 i, j, k ;
-       u16 Count ;
-
-       for (i = 0; i < state->Init_Ctrl_Num ; i++) {
-
-               if (controlNum == state->Init_Ctrl[i].Ctrl_Num) {
-
-                       Count = 1;
-                       RegNum[0] = (u8)(state->Init_Ctrl[i].addr[0]);
-
-                       for (k = 1; k < state->Init_Ctrl[i].size; k++) {
-
-                               for (j = 0; j < Count; j++) {
-
-                                       if (state->Init_Ctrl[i].addr[k] !=
-                                               RegNum[j]) {
-
-                                               Count++;
-                                               RegNum[Count-1] = (u8)(state->Init_Ctrl[i].addr[k]);
-
-                                       }
-                               }
-
-                       }
-                       *count = Count;
-                       return 0;
-               }
-       }
-       for (i = 0; i < state->CH_Ctrl_Num ; i++) {
-
-               if (controlNum == state->CH_Ctrl[i].Ctrl_Num) {
-
-                       Count = 1;
-                       RegNum[0] = (u8)(state->CH_Ctrl[i].addr[0]);
-
-                       for (k = 1; k < state->CH_Ctrl[i].size; k++) {
-
-                               for (j = 0; j < Count; j++) {
-
-                                       if (state->CH_Ctrl[i].addr[k] !=
-                                               RegNum[j]) {
-
-                                               Count++;
-                                               RegNum[Count-1] = (u8)(state->CH_Ctrl[i].addr[k]);
-
-                                       }
-                               }
-                       }
-                       *count = Count;
-                       return 0;
-               }
-       }
-#ifdef _MXL_INTERNAL
-       for (i = 0; i < state->MXL_Ctrl_Num ; i++) {
-
-               if (controlNum == state->MXL_Ctrl[i].Ctrl_Num) {
-
-                       Count = 1;
-                       RegNum[0] = (u8)(state->MXL_Ctrl[i].addr[0]);
-
-                       for (k = 1; k < state->MXL_Ctrl[i].size; k++) {
-
-                               for (j = 0; j < Count; j++) {
-
-                                       if (state->MXL_Ctrl[i].addr[k] !=
-                                               RegNum[j]) {
-
-                                               Count++;
-                                               RegNum[Count-1] = (u8)state->MXL_Ctrl[i].addr[k];
-
-                                       }
-                               }
-                       }
-                       *count = Count;
-                       return 0;
-               }
-       }
-#endif
-       *count = 0;
-       return 1;
-}
-
 static void MXL_RegWriteBit(struct dvb_frontend *fe, u8 address, u8 bit,
        u8 bitVal)
 {
@@ -3758,24 +3656,6 @@ static u16 MXL_GetCHRegister_ZeroIF(struct dvb_frontend *fe, u8 *RegNum,
        return status;
 }
 
-static u16 MXL_GetCHRegister_LowIF(struct dvb_frontend *fe, u8 *RegNum,
-       u8 *RegVal, int *count)
-{
-       u16 status = 0;
-       int i;
-
-       u8 RegAddr[] = { 138 };
-
-       *count = sizeof(RegAddr) / sizeof(u8);
-
-       for (i = 0; i < *count; i++) {
-               RegNum[i] = RegAddr[i];
-               status += MXL_RegRead(fe, RegNum[i], &RegVal[i]);
-       }
-
-       return status;
-}
-
 static u16 MXL_GetMasterControl(u8 *MasterReg, int state)
 {
        if (state == 1) /* Load_Start */