Merge remote branch 'kumar/merge' into merge

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

diff --git a/drivers/media/dvb/frontends/bcm3510.c b/drivers/media/dvb/frontends/bcm3510.c
index a913f49..8aff586 100644 (file)
--- a/drivers/media/dvb/frontends/bcm3510.c
+++ b/drivers/media/dvb/frontends/bcm3510.c
@@ -91,7 +91,7 @@ static int bcm3510_writebytes (struct bcm3510_state *state, u8 reg, u8 *buf, u8
        if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) {
 
                deb_info("%s: i2c write error (addr %02x, reg %02x, err == %i)\n",
-                       __FUNCTION__, state->config->demod_address, reg,  err);
+                       __func__, state->config->demod_address, reg,  err);
                return -EREMOTEIO;
        }
 
@@ -110,7 +110,7 @@ static int bcm3510_readbytes (struct bcm3510_state *state, u8 reg, u8 *buf, u8 l
 
        if ((err = i2c_transfer (state->i2c, msg, 2)) != 2) {
                deb_info("%s: i2c read error (addr %02x, reg %02x, err == %i)\n",
-                       __FUNCTION__, state->config->demod_address, reg,  err);
+                       __func__, state->config->demod_address, reg,  err);
                return -EREMOTEIO;
        }
        deb_i2c("i2c rd %02x: ",reg);
@@ -155,7 +155,7 @@ static int bcm3510_hab_send_request(struct bcm3510_state *st, u8 *buf, int len)
        unsigned long t;
 
 /* Check if any previous HAB request still needs to be serviced by the
- * Aquisition Processor before sending new request */
+ * Acquisition Processor before sending new request */
        if ((ret = bcm3510_readB(st,0xa8,&v)) < 0)
                return ret;
        if (v.HABSTAT_a8.HABR) {
@@ -361,7 +361,7 @@ static int bcm3510_tuner_cmd(struct bcm3510_state* st,u8 bc, u16 n, u8 a)
 /* Set duration of the initial state of TUNCTL = 3.34 micro Sec */
        c.TUNCTL_state = 0x40;
 
-/* PRESCALER DEVIDE RATIO | BC1_2_3_4; (band switch), 1stosc REFERENCE COUNTER REF_S12 and REF_S11 */
+/* PRESCALER DIVIDE RATIO | BC1_2_3_4; (band switch), 1stosc REFERENCE COUNTER REF_S12 and REF_S11 */
        c.ctl_dat[0].ctrl.size = BITS_8;
        c.ctl_dat[0].data      = 0x80 | bc;
 
@@ -397,7 +397,7 @@ static int bcm3510_tuner_cmd(struct bcm3510_state* st,u8 bc, u16 n, u8 a)
        c.ctl_dat[7].ctrl.cs0  = 1;
        c.ctl_dat[7].data      = 0x40;
 
-/* PRESCALER DEVIDE RATIO, 2ndosc REFERENCE COUNTER REF_S12 and REF_S11 */
+/* PRESCALER DIVIDE RATIO, 2ndosc REFERENCE COUNTER REF_S12 and REF_S11 */
        c.ctl_dat[8].ctrl.size = BITS_8;
        c.ctl_dat[8].data      = 0x80;
 
@@ -590,7 +590,8 @@ static void bcm3510_release(struct dvb_frontend* fe)
  */
 #define BCM3510_DEFAULT_FIRMWARE "dvb-fe-bcm3510-01.fw"
 
-static int bcm3510_write_ram(struct bcm3510_state *st, u16 addr, u8 *b, u16 len)
+static int bcm3510_write_ram(struct bcm3510_state *st, u16 addr, const u8 *b,
+                            u16 len)
 {
        int ret = 0,i;
        bcm3510_register_value vH, vL,vD;
@@ -614,7 +615,7 @@ static int bcm3510_download_firmware(struct dvb_frontend* fe)
        struct bcm3510_state* st = fe->demodulator_priv;
        const struct firmware *fw;
        u16 addr,len;
-       u8  *b;
+       const u8 *b;
        int ret,i;
 
        deb_info("requesting firmware\n");