1 files changed, 14 insertions, 14 deletions

diff --git a/drivers/media/video/tuner-xc2028.c b/drivers/media/video/tuner-xc2028.c
index 098a9956a2bc..62b5de231e0d 100644
--- a/drivers/media/video/tuner-xc2028.c
+++ b/drivers/media/video/tuner-xc2028.c
@@ -135,7 +135,7 @@ static unsigned int xc2028_get_reg(struct xc2028_data *priv, u16 reg, u16 *val)
         unsigned char buf[2];
         unsigned char ibuf[2];
 
-        tuner_dbg("%s %04x called\n", __FUNCTION__, reg);
+        tuner_dbg("%s %04x called\n", __func__, reg);
 
         buf[0] = reg >> 8;
         buf[1] = (unsigned char) reg;
@@ -260,7 +260,7 @@ static int load_all_firmwares(struct dvb_frontend *fe)
         char                  name[33];
         char                  *fname;
 
-        tuner_dbg("%s called\n", __FUNCTION__);
+        tuner_dbg("%s called\n", __func__);
 
         if (!firmware_name[0])
                 fname = priv->ctrl.fname;
@@ -405,7 +405,7 @@ static int seek_firmware(struct dvb_frontend *fe, unsigned int type,
         int                 i, best_i = -1, best_nr_matches = 0;
         unsigned int        ign_firm_type_mask = 0;
 
-        tuner_dbg("%s called, want type=", __FUNCTION__);
+        tuner_dbg("%s called, want type=", __func__);
         if (debug) {
                 dump_firm_type(type);
                 printk("(%x), id %016llx.\n", type, (unsigned long long)*id);
@@ -491,7 +491,7 @@ static int load_firmware(struct dvb_frontend *fe, unsigned int type,
         int                pos, rc;
         unsigned char      *p, *endp, buf[priv->ctrl.max_len];
 
-        tuner_dbg("%s called\n", __FUNCTION__);
+        tuner_dbg("%s called\n", __func__);
 
         pos = seek_firmware(fe, type, id);
         if (pos < 0)
@@ -594,7 +594,7 @@ static int load_scode(struct dvb_frontend *fe, unsigned int type,
         int                pos, rc;
         unsigned char      *p;
 
-        tuner_dbg("%s called\n", __FUNCTION__);
+        tuner_dbg("%s called\n", __func__);
 
         if (!int_freq) {
                 pos = seek_firmware(fe, type, id);
@@ -658,7 +658,7 @@ static int check_firmware(struct dvb_frontend *fe, unsigned int type,
         u16                        version, hwmodel;
         v4l2_std_id                std0;
 
-        tuner_dbg("%s called\n", __FUNCTION__);
+        tuner_dbg("%s called\n", __func__);
 
         if (!priv->firm) {
                 if (!priv->ctrl.fname) {
@@ -832,7 +832,7 @@ static int xc2028_signal(struct dvb_frontend *fe, u16 *strength)
         u16                 frq_lock, signal = 0;
         int                 rc;
 
-        tuner_dbg("%s called\n", __FUNCTION__);
+        tuner_dbg("%s called\n", __func__);
 
         mutex_lock(&priv->lock);
 
@@ -869,7 +869,7 @@ static int generic_set_freq(struct dvb_frontend *fe, u32 freq /* in HZ */,
         unsigned char      buf[4];
         u32                div, offset = 0;
 
-        tuner_dbg("%s called\n", __FUNCTION__);
+        tuner_dbg("%s called\n", __func__);
 
         mutex_lock(&priv->lock);
 
@@ -952,7 +952,7 @@ static int xc2028_set_analog_freq(struct dvb_frontend *fe,
         struct xc2028_data *priv = fe->tuner_priv;
         unsigned int       type=0;
 
-        tuner_dbg("%s called\n", __FUNCTION__);
+        tuner_dbg("%s called\n", __func__);
 
         if (p->mode == V4L2_TUNER_RADIO) {
                 type |= FM;
@@ -985,7 +985,7 @@ static int xc2028_set_params(struct dvb_frontend *fe,
         fe_bandwidth_t     bw = BANDWIDTH_8_MHZ;
         u16                demod = 0;
 
-        tuner_dbg("%s called\n", __FUNCTION__);
+        tuner_dbg("%s called\n", __func__);
 
         if (priv->ctrl.d2633)
                 type |= D2633;
@@ -1055,7 +1055,7 @@ static int xc2028_sleep(struct dvb_frontend *fe)
         struct xc2028_data *priv = fe->tuner_priv;
         int rc = 0;
 
-        tuner_dbg("%s called\n", __FUNCTION__);
+        tuner_dbg("%s called\n", __func__);
 
         mutex_lock(&priv->lock);
 
@@ -1076,7 +1076,7 @@ static int xc2028_dvb_release(struct dvb_frontend *fe)
 {
         struct xc2028_data *priv = fe->tuner_priv;
 
-        tuner_dbg("%s called\n", __FUNCTION__);
+        tuner_dbg("%s called\n", __func__);
 
         mutex_lock(&xc2028_list_mutex);
 
@@ -1101,7 +1101,7 @@ static int xc2028_get_frequency(struct dvb_frontend *fe, u32 *frequency)
 {
         struct xc2028_data *priv = fe->tuner_priv;
 
-        tuner_dbg("%s called\n", __FUNCTION__);
+        tuner_dbg("%s called\n", __func__);
 
         *frequency = priv->frequency;
 
@@ -1114,7 +1114,7 @@ static int xc2028_set_config(struct dvb_frontend *fe, void *priv_cfg)
         struct xc2028_ctrl *p    = priv_cfg;
         int                 rc   = 0;
 
-        tuner_dbg("%s called\n", __FUNCTION__);
+        tuner_dbg("%s called\n", __func__);
 
         mutex_lock(&priv->lock);