Merge branches 'topic/fix/misc' and 'topic/fix/hda' into for-linus

[linux-2.6-omap-h63xx.git] / drivers / media / dvb / frontends / sp8870.c

diff --git a/drivers/media/dvb/frontends/sp8870.c b/drivers/media/dvb/frontends/sp8870.c
index da876f7bfe32b045595a568297c77c3f79aed534..1c9a9b4051b9efdbc8a4a9eba005d74f883c4e11 100644 (file)
--- a/drivers/media/dvb/frontends/sp8870.c
+++ b/drivers/media/dvb/frontends/sp8870.c
@@ -70,7 +70,7 @@ static int sp8870_writereg (struct sp8870_state* state, u16 reg, u16 data)
        int err;
 
        if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) {
-               dprintk ("%s: writereg error (err == %i, reg == 0x%02x, data == 0x%02x)\n", __FUNCTION__, err, reg, data);
+               dprintk ("%s: writereg error (err == %i, reg == 0x%02x, data == 0x%02x)\n", __func__, err, reg, data);
                return -EREMOTEIO;
        }
 
@@ -88,7 +88,7 @@ static int sp8870_readreg (struct sp8870_state* state, u16 reg)
        ret = i2c_transfer (state->i2c, msg, 2);
 
        if (ret != 2) {
-               dprintk("%s: readreg error (ret == %i)\n", __FUNCTION__, ret);
+               dprintk("%s: readreg error (ret == %i)\n", __func__, ret);
                return -1;
        }
 
@@ -98,13 +98,13 @@ static int sp8870_readreg (struct sp8870_state* state, u16 reg)
 static int sp8870_firmware_upload (struct sp8870_state* state, const struct firmware *fw)
 {
        struct i2c_msg msg;
-       char *fw_buf = fw->data;
+       const char *fw_buf = fw->data;
        int fw_pos;
        u8 tx_buf[255];
        int tx_len;
        int err = 0;
 
-       dprintk ("%s: ...\n", __FUNCTION__);
+       dprintk ("%s: ...\n", __func__);
 
        if (fw->size < SP8870_FIRMWARE_SIZE + SP8870_FIRMWARE_OFFSET)
                return -EINVAL;
@@ -131,14 +131,14 @@ static int sp8870_firmware_upload (struct sp8870_state* state, const struct firm
                msg.buf = tx_buf;
                msg.len = tx_len + 2;
                if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) {
-                       printk("%s: firmware upload failed!\n", __FUNCTION__);
-                       printk ("%s: i2c error (err == %i)\n", __FUNCTION__, err);
+                       printk("%s: firmware upload failed!\n", __func__);
+                       printk ("%s: i2c error (err == %i)\n", __func__, err);
                        return err;
                }
                fw_pos += tx_len;
        }
 
-       dprintk ("%s: done!\n", __FUNCTION__);
+       dprintk ("%s: done!\n", __func__);
        return 0;
 };
 
@@ -310,7 +310,7 @@ static int sp8870_init (struct dvb_frontend* fe)
        if (state->initialised) return 0;
        state->initialised = 1;
 
-       dprintk ("%s\n", __FUNCTION__);
+       dprintk ("%s\n", __func__);
 
 
        /* request the firmware, this will block until someone uploads it */
@@ -449,15 +449,15 @@ static int sp8870_read_uncorrected_blocks (struct dvb_frontend* fe, u32* ublocks
        return 0;
 }
 
-// number of trials to recover from lockup
+/* number of trials to recover from lockup */
 #define MAXTRIALS 5
-// maximum checks for data valid signal
+/* maximum checks for data valid signal */
 #define MAXCHECKS 100
 
-// only for debugging: counter for detected lockups
-static int lockups = 0;
-// only for debugging: counter for channel switches
-static int switches = 0;
+/* only for debugging: counter for detected lockups */
+static int lockups;
+/* only for debugging: counter for channel switches */
+static int switches;
 
 static int sp8870_set_frontend (struct dvb_frontend* fe, struct dvb_frontend_parameters *p)
 {
@@ -475,7 +475,7 @@ static int sp8870_set_frontend (struct dvb_frontend* fe, struct dvb_frontend_par
        int trials = 0;
        int check_count = 0;
 
-       dprintk("%s: frequency = %i\n", __FUNCTION__, p->frequency);
+       dprintk("%s: frequency = %i\n", __func__, p->frequency);
 
        for (trials = 1; trials <= MAXTRIALS; trials++) {
 
@@ -487,7 +487,7 @@ static int sp8870_set_frontend (struct dvb_frontend* fe, struct dvb_frontend_par
                        valid = sp8870_read_data_valid_signal(state);
                        if (valid) {
                                dprintk("%s: delay = %i usec\n",
-                                       __FUNCTION__, check_count * 10);
+                                       __func__, check_count * 10);
                                break;
                        }
                        udelay(10);
@@ -497,20 +497,20 @@ static int sp8870_set_frontend (struct dvb_frontend* fe, struct dvb_frontend_par
        }
 
        if (!valid) {
-               printk("%s: firmware crash!!!!!!\n", __FUNCTION__);
+               printk("%s: firmware crash!!!!!!\n", __func__);
                return -EIO;
        }
 
        if (debug) {
                if (valid) {
                        if (trials > 1) {
-                               printk("%s: firmware lockup!!!\n", __FUNCTION__);
-                               printk("%s: recovered after %i trial(s))\n",  __FUNCTION__, trials - 1);
+                               printk("%s: firmware lockup!!!\n", __func__);
+                               printk("%s: recovered after %i trial(s))\n",  __func__, trials - 1);
                                lockups++;
                        }
                }
                switches++;
-               printk("%s: switches = %i lockups = %i\n", __FUNCTION__, switches, lockups);
+               printk("%s: switches = %i lockups = %i\n", __func__, switches, lockups);
        }
 
        return 0;