Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq

[linux-2.6-omap-h63xx.git] / drivers / media / dvb / dvb-usb / vp702x-fe.c

diff --git a/drivers/media/dvb/dvb-usb/vp702x-fe.c b/drivers/media/dvb/dvb-usb/vp702x-fe.c
index c3fdc7cd094e33f41c4e2c34f4ec7b565233d2e6..ccc7e445266450dc41efd1313396b53c762db46d 100644 (file)
--- a/drivers/media/dvb/dvb-usb/vp702x-fe.c
+++ b/drivers/media/dvb/dvb-usb/vp702x-fe.c
@@ -67,7 +67,7 @@ static int vp702x_fe_read_status(struct dvb_frontend* fe, fe_status_t *status)
 {
        struct vp702x_fe_state *st = fe->demodulator_priv;
        vp702x_fe_refresh_state(st);
-       deb_fe("%s\n",__FUNCTION__);
+       deb_fe("%s\n",__func__);
 
        if (st->lock == 0)
                *status = FE_HAS_LOCK | FE_HAS_SYNC | FE_HAS_VITERBI | FE_HAS_SIGNAL | FE_HAS_CARRIER;
@@ -121,7 +121,7 @@ static int vp702x_fe_read_snr(struct dvb_frontend* fe, u16 *snr)
 
 static int vp702x_fe_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_tune_settings *tune)
 {
-       deb_fe("%s\n",__FUNCTION__);
+       deb_fe("%s\n",__func__);
        tune->min_delay_ms = 2000;
        return 0;
 }
@@ -183,21 +183,21 @@ static int vp702x_fe_set_frontend(struct dvb_frontend* fe,
 static int vp702x_fe_init(struct dvb_frontend *fe)
 {
        struct vp702x_fe_state *st = fe->demodulator_priv;
-       deb_fe("%s\n",__FUNCTION__);
+       deb_fe("%s\n",__func__);
        vp702x_usb_in_op(st->d, RESET_TUNER, 0, 0, NULL, 0);
        return 0;
 }
 
 static int vp702x_fe_sleep(struct dvb_frontend *fe)
 {
-       deb_fe("%s\n",__FUNCTION__);
+       deb_fe("%s\n",__func__);
        return 0;
 }
 
 static int vp702x_fe_get_frontend(struct dvb_frontend* fe,
                                  struct dvb_frontend_parameters *fep)
 {
-       deb_fe("%s\n",__FUNCTION__);
+       deb_fe("%s\n",__func__);
        return 0;
 }
 
@@ -208,7 +208,7 @@ static int vp702x_fe_send_diseqc_msg (struct dvb_frontend* fe,
        u8 cmd[8],ibuf[10];
        memset(cmd,0,8);
 
-       deb_fe("%s\n",__FUNCTION__);
+       deb_fe("%s\n",__func__);
 
        if (m->msg_len > 4)
                return -EINVAL;
@@ -230,7 +230,7 @@ static int vp702x_fe_send_diseqc_msg (struct dvb_frontend* fe,
 
 static int vp702x_fe_send_diseqc_burst (struct dvb_frontend* fe, fe_sec_mini_cmd_t burst)
 {
-       deb_fe("%s\n",__FUNCTION__);
+       deb_fe("%s\n",__func__);
        return 0;
 }
 
@@ -238,7 +238,7 @@ static int vp702x_fe_set_tone(struct dvb_frontend* fe, fe_sec_tone_mode_t tone)
 {
        struct vp702x_fe_state *st = fe->demodulator_priv;
        u8 ibuf[10];
-       deb_fe("%s\n",__FUNCTION__);
+       deb_fe("%s\n",__func__);
 
        st->tone_mode = tone;
 
@@ -263,7 +263,7 @@ static int vp702x_fe_set_voltage (struct dvb_frontend* fe, fe_sec_voltage_t
 {
        struct vp702x_fe_state *st = fe->demodulator_priv;
        u8 ibuf[10];
-       deb_fe("%s\n",__FUNCTION__);
+       deb_fe("%s\n",__func__);
 
        st->voltage = voltage;