Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb

[pandora-kernel.git] / drivers / media / dvb / frontends / s5h1409.c

diff --git a/drivers/media/dvb/frontends/s5h1409.c b/drivers/media/dvb/frontends/s5h1409.c
index 8194334..5ddb2dc 100644 (file)
--- a/drivers/media/dvb/frontends/s5h1409.c
+++ b/drivers/media/dvb/frontends/s5h1409.c
@@ -26,7 +26,6 @@
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include "dvb_frontend.h"
-#include "dvb-pll.h"
 #include "s5h1409.h"
 
 struct s5h1409_state {
@@ -48,7 +47,7 @@ struct s5h1409_state {
        u32 qam_state;
 };
 
-static int debug = 0;
+static int debug;
 #define dprintk        if (debug) printk
 
 /* Register values to initialise the demod, this will set VSB by default */
@@ -312,7 +311,7 @@ static int s5h1409_writereg(struct s5h1409_state* state, u8 reg, u16 data)
 
        if (ret != 1)
                printk("%s: writereg error (reg == 0x%02x, val == 0x%04x, "
-                      "ret == %i)\n", __FUNCTION__, reg, data, ret);
+                      "ret == %i)\n", __func__, reg, data, ret);
 
        return (ret != 1) ? -1 : 0;
 }
@@ -332,7 +331,7 @@ static u16 s5h1409_readreg(struct s5h1409_state* state, u8 reg)
        ret = i2c_transfer(state->i2c, msg, 2);
 
        if (ret != 2)
-               printk("%s: readreg error (ret == %i)\n", __FUNCTION__, ret);
+               printk("%s: readreg error (ret == %i)\n", __func__, ret);
        return (b1[0] << 8) | b1[1];
 }
 
@@ -340,7 +339,7 @@ static int s5h1409_softreset(struct dvb_frontend* fe)
 {
        struct s5h1409_state* state = fe->demodulator_priv;
 
-       dprintk("%s()\n", __FUNCTION__);
+       dprintk("%s()\n", __func__);
 
        s5h1409_writereg(state, 0xf5, 0);
        s5h1409_writereg(state, 0xf5, 1);
@@ -356,7 +355,7 @@ static int s5h1409_set_if_freq(struct dvb_frontend* fe, int KHz)
 {
        struct s5h1409_state* state = fe->demodulator_priv;
 
-       dprintk("%s(%d KHz)\n", __FUNCTION__, KHz);
+       dprintk("%s(%d KHz)\n", __func__, KHz);
 
        switch (KHz) {
        case 4000:
@@ -381,7 +380,7 @@ static int s5h1409_set_spectralinversion(struct dvb_frontend* fe, int inverted)
 {
        struct s5h1409_state* state = fe->demodulator_priv;
 
-       dprintk("%s(%d)\n", __FUNCTION__, inverted);
+       dprintk("%s(%d)\n", __func__, inverted);
 
        if(inverted == 1)
                return s5h1409_writereg(state, 0x1b, 0x1101); /* Inverted */
@@ -394,25 +393,25 @@ static int s5h1409_enable_modulation(struct dvb_frontend* fe,
 {
        struct s5h1409_state* state = fe->demodulator_priv;
 
-       dprintk("%s(0x%08x)\n", __FUNCTION__, m);
+       dprintk("%s(0x%08x)\n", __func__, m);
 
        switch(m) {
        case VSB_8:
-               dprintk("%s() VSB_8\n", __FUNCTION__);
+               dprintk("%s() VSB_8\n", __func__);
                if (state->if_freq != S5H1409_VSB_IF_FREQ)
                        s5h1409_set_if_freq(fe, S5H1409_VSB_IF_FREQ);
                s5h1409_writereg(state, 0xf4, 0);
                break;
        case QAM_64:
        case QAM_256:
-               dprintk("%s() QAM_AUTO (64/256)\n", __FUNCTION__);
+               dprintk("%s() QAM_AUTO (64/256)\n", __func__);
                if (state->if_freq != S5H1409_QAM_IF_FREQ)
                        s5h1409_set_if_freq(fe, S5H1409_QAM_IF_FREQ);
                s5h1409_writereg(state, 0xf4, 1);
                s5h1409_writereg(state, 0x85, 0x110);
                break;
        default:
-               dprintk("%s() Invalid modulation\n", __FUNCTION__);
+               dprintk("%s() Invalid modulation\n", __func__);
                return -EINVAL;
        }
 
@@ -426,7 +425,7 @@ static int s5h1409_i2c_gate_ctrl(struct dvb_frontend* fe, int enable)
 {
        struct s5h1409_state* state = fe->demodulator_priv;
 
-       dprintk("%s(%d)\n", __FUNCTION__, enable);
+       dprintk("%s(%d)\n", __func__, enable);
 
        if (enable)
                return s5h1409_writereg(state, 0xf3, 1);
@@ -438,21 +437,21 @@ static int s5h1409_set_gpio(struct dvb_frontend* fe, int enable)
 {
        struct s5h1409_state* state = fe->demodulator_priv;
 
-       dprintk("%s(%d)\n", __FUNCTION__, enable);
+       dprintk("%s(%d)\n", __func__, enable);
 
        if (enable)
                return s5h1409_writereg(state, 0xe3,
                        s5h1409_readreg(state, 0xe3) | 0x1100);
        else
                return s5h1409_writereg(state, 0xe3,
-                       s5h1409_readreg(state, 0xe3) & 0xeeff);
+                       s5h1409_readreg(state, 0xe3) & 0xfeff);
 }
 
 static int s5h1409_sleep(struct dvb_frontend* fe, int enable)
 {
        struct s5h1409_state* state = fe->demodulator_priv;
 
-       dprintk("%s(%d)\n", __FUNCTION__, enable);
+       dprintk("%s(%d)\n", __func__, enable);
 
        return s5h1409_writereg(state, 0xf2, enable);
 }
@@ -461,7 +460,7 @@ static int s5h1409_register_reset(struct dvb_frontend* fe)
 {
        struct s5h1409_state* state = fe->demodulator_priv;
 
-       dprintk("%s()\n", __FUNCTION__);
+       dprintk("%s()\n", __func__);
 
        return s5h1409_writereg(state, 0xfa, 0);
 }
@@ -534,7 +533,7 @@ static int s5h1409_set_frontend (struct dvb_frontend* fe,
 {
        struct s5h1409_state* state = fe->demodulator_priv;
 
-       dprintk("%s(frequency=%d)\n", __FUNCTION__, p->frequency);
+       dprintk("%s(frequency=%d)\n", __func__, p->frequency);
 
        s5h1409_softreset(fe);
 
@@ -565,7 +564,7 @@ static int s5h1409_set_mpeg_timing(struct dvb_frontend *fe, int mode)
        struct s5h1409_state *state = fe->demodulator_priv;
        u16 val;
 
-       dprintk("%s(%d)\n", __FUNCTION__, mode);
+       dprintk("%s(%d)\n", __func__, mode);
 
        val = s5h1409_readreg(state, 0xac) & 0xcfff;
        switch (mode) {
@@ -573,7 +572,7 @@ static int s5h1409_set_mpeg_timing(struct dvb_frontend *fe, int mode)
                val |= 0x0000;
                break;
        case S5H1409_MPEGTIMING_CONTINOUS_NONINVERTING_CLOCK:
-               dprintk("%s(%d) Mode1 or Defaulting\n", __FUNCTION__, mode);
+               dprintk("%s(%d) Mode1 or Defaulting\n", __func__, mode);
                val |= 0x1000;
                break;
        case S5H1409_MPEGTIMING_NONCONTINOUS_INVERTING_CLOCK:
@@ -597,7 +596,7 @@ static int s5h1409_init (struct dvb_frontend* fe)
        int i;
 
        struct s5h1409_state* state = fe->demodulator_priv;
-       dprintk("%s()\n", __FUNCTION__);
+       dprintk("%s()\n", __func__);
 
        s5h1409_sleep(fe, 0);
        s5h1409_register_reset(fe);
@@ -663,7 +662,7 @@ static int s5h1409_read_status(struct dvb_frontend* fe, fe_status_t* status)
                break;
        }
 
-       dprintk("%s() status 0x%08x\n", __FUNCTION__, *status);
+       dprintk("%s() status 0x%08x\n", __func__, *status);
 
        return 0;
 }
@@ -671,7 +670,7 @@ static int s5h1409_read_status(struct dvb_frontend* fe, fe_status_t* status)
 static int s5h1409_qam256_lookup_snr(struct dvb_frontend* fe, u16* snr, u16 v)
 {
        int i, ret = -EINVAL;
-       dprintk("%s()\n", __FUNCTION__);
+       dprintk("%s()\n", __func__);
 
        for (i=0; i < ARRAY_SIZE(qam256_snr_tab); i++) {
                if (v < qam256_snr_tab[i].val) {
@@ -686,7 +685,7 @@ static int s5h1409_qam256_lookup_snr(struct dvb_frontend* fe, u16* snr, u16 v)
 static int s5h1409_qam64_lookup_snr(struct dvb_frontend* fe, u16* snr, u16 v)
 {
        int i, ret = -EINVAL;
-       dprintk("%s()\n", __FUNCTION__);
+       dprintk("%s()\n", __func__);
 
        for (i=0; i < ARRAY_SIZE(qam64_snr_tab); i++) {
                if (v < qam64_snr_tab[i].val) {
@@ -701,7 +700,7 @@ static int s5h1409_qam64_lookup_snr(struct dvb_frontend* fe, u16* snr, u16 v)
 static int s5h1409_vsb_lookup_snr(struct dvb_frontend* fe, u16* snr, u16 v)
 {
        int i, ret = -EINVAL;
-       dprintk("%s()\n", __FUNCTION__);
+       dprintk("%s()\n", __func__);
 
        for (i=0; i < ARRAY_SIZE(vsb_snr_tab); i++) {
                if (v > vsb_snr_tab[i].val) {
@@ -710,7 +709,7 @@ static int s5h1409_vsb_lookup_snr(struct dvb_frontend* fe, u16* snr, u16 v)
                        break;
                }
        }
-       dprintk("%s() snr=%d\n", __FUNCTION__, *snr);
+       dprintk("%s() snr=%d\n", __func__, *snr);
        return ret;
 }
 
@@ -718,7 +717,7 @@ static int s5h1409_read_snr(struct dvb_frontend* fe, u16* snr)
 {
        struct s5h1409_state* state = fe->demodulator_priv;
        u16 reg;
-       dprintk("%s()\n", __FUNCTION__);
+       dprintk("%s()\n", __func__);
 
        switch(state->current_modulation) {
        case QAM_64:
@@ -812,7 +811,7 @@ struct dvb_frontend* s5h1409_attach(const struct s5h1409_config* config,
 
        if (s5h1409_init(&state->frontend) != 0) {
                printk(KERN_ERR "%s: Failed to initialize correctly\n",
-                       __FUNCTION__);
+                       __func__);
                goto error;
        }