V4L/DVB (7514): media/dvb/frontends replace remaining __FUNCTION__ occurrences

[cascardo/linux.git] / drivers / media / dvb / frontends / tda10023.c

diff --git a/drivers/media/dvb/frontends/tda10023.c b/drivers/media/dvb/frontends/tda10023.c
index 4bb06f9..0727b80 100644 (file)
--- a/drivers/media/dvb/frontends/tda10023.c
+++ b/drivers/media/dvb/frontends/tda10023.c
@@ -118,7 +118,7 @@ static u8 tda10023_readreg (struct tda10023_state* state, u8 reg)
        ret = i2c_transfer (state->i2c, msg, 2);
        if (ret != 2)
                printk("DVB: TDA10023: %s: readreg error (ret == %i)\n",
-                                __FUNCTION__, ret);
+                                __func__, ret);
        return b1[0];
 }
 
@@ -132,7 +132,7 @@ static int tda10023_writereg (struct tda10023_state* state, u8 reg, u8 data)
        if (ret != 1)
                printk("DVB: TDA10023(%d): %s, writereg error "
                        "(reg == 0x%02x, val == 0x%02x, ret == %i)\n",
-                       state->frontend.dvb->num, __FUNCTION__, reg, data, ret);
+                       state->frontend.dvb->num, __func__, reg, data, ret);
 
        return (ret != 1) ? -EREMOTEIO : 0;
 }
@@ -215,12 +215,6 @@ static int tda10023_set_symbolrate (struct tda10023_state* state, u32 sr)
        s16 SFIL=0;
        u16 NDEC = 0;
 
-       if (sr > (SYSCLK/(2*4)))
-               sr=SYSCLK/(2*4);
-
-       if (sr<870000)
-               sr=870000;
-
        if (sr < (u32)(SYSCLK/98.40)) {
                NDEC=3;
                SFIL=1;
@@ -506,8 +500,8 @@ static struct dvb_frontend_ops tda10023_ops = {
                .name = "Philips TDA10023 DVB-C",
                .type = FE_QAM,
                .frequency_stepsize = 62500,
-               .frequency_min = 51000000,
-               .frequency_max = 858000000,
+               .frequency_min = 47000000,
+               .frequency_max = 862000000,
                .symbol_rate_min = (SYSCLK/2)/64,     /* SACLK/64 == (SYSCLK/2)/64 */
                .symbol_rate_max = (SYSCLK/2)/4,      /* SACLK/4 */
                .caps = 0x400 | //FE_CAN_QAM_4