aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/frontends/cx22700.c
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-04-08 22:20:00 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-04-24 13:07:58 -0400
commit271ddbf702c3a4e6b18f6464180eda0f62efd9a5 (patch)
tree37a384a4ce6216c694ee0d86ffc89d4aa56944e1 /drivers/media/dvb/frontends/cx22700.c
parent708bebdd3922c6f346b8540f93c73f006d2b947b (diff)
V4L/DVB (7514): media/dvb/frontends replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__ Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Acked-by: Oliver Endriss <o.endriss@gmx.de> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/dvb/frontends/cx22700.c')
-rw-r--r--drivers/media/dvb/frontends/cx22700.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/dvb/frontends/cx22700.c b/drivers/media/dvb/frontends/cx22700.c
index 11a4968f18cb..ace5cb17165d 100644
--- a/drivers/media/dvb/frontends/cx22700.c
+++ b/drivers/media/dvb/frontends/cx22700.c
@@ -73,13 +73,13 @@ static int cx22700_writereg (struct cx22700_state* state, u8 reg, u8 data)
73 u8 buf [] = { reg, data }; 73 u8 buf [] = { reg, data };
74 struct i2c_msg msg = { .addr = state->config->demod_address, .flags = 0, .buf = buf, .len = 2 }; 74 struct i2c_msg msg = { .addr = state->config->demod_address, .flags = 0, .buf = buf, .len = 2 };
75 75
76 dprintk ("%s\n", __FUNCTION__); 76 dprintk ("%s\n", __func__);
77 77
78 ret = i2c_transfer (state->i2c, &msg, 1); 78 ret = i2c_transfer (state->i2c, &msg, 1);
79 79
80 if (ret != 1) 80 if (ret != 1)
81 printk("%s: writereg error (reg == 0x%02x, val == 0x%02x, ret == %i)\n", 81 printk("%s: writereg error (reg == 0x%02x, val == 0x%02x, ret == %i)\n",
82 __FUNCTION__, reg, data, ret); 82 __func__, reg, data, ret);
83 83
84 return (ret != 1) ? -1 : 0; 84 return (ret != 1) ? -1 : 0;
85} 85}
@@ -92,7 +92,7 @@ static int cx22700_readreg (struct cx22700_state* state, u8 reg)
92 struct i2c_msg msg [] = { { .addr = state->config->demod_address, .flags = 0, .buf = b0, .len = 1 }, 92 struct i2c_msg msg [] = { { .addr = state->config->demod_address, .flags = 0, .buf = b0, .len = 1 },
93 { .addr = state->config->demod_address, .flags = I2C_M_RD, .buf = b1, .len = 1 } }; 93 { .addr = state->config->demod_address, .flags = I2C_M_RD, .buf = b1, .len = 1 } };
94 94
95 dprintk ("%s\n", __FUNCTION__); 95 dprintk ("%s\n", __func__);
96 96
97 ret = i2c_transfer (state->i2c, msg, 2); 97 ret = i2c_transfer (state->i2c, msg, 2);
98 98
@@ -105,7 +105,7 @@ static int cx22700_set_inversion (struct cx22700_state* state, int inversion)
105{ 105{
106 u8 val; 106 u8 val;
107 107
108 dprintk ("%s\n", __FUNCTION__); 108 dprintk ("%s\n", __func__);
109 109
110 switch (inversion) { 110 switch (inversion) {
111 case INVERSION_AUTO: 111 case INVERSION_AUTO:
@@ -127,7 +127,7 @@ static int cx22700_set_tps (struct cx22700_state *state, struct dvb_ofdm_paramet
127 static const u8 fec_tab [6] = { 0, 1, 2, 0, 3, 4 }; 127 static const u8 fec_tab [6] = { 0, 1, 2, 0, 3, 4 };
128 u8 val; 128 u8 val;
129 129
130 dprintk ("%s\n", __FUNCTION__); 130 dprintk ("%s\n", __func__);
131 131
132 if (p->code_rate_HP < FEC_1_2 || p->code_rate_HP > FEC_7_8) 132 if (p->code_rate_HP < FEC_1_2 || p->code_rate_HP > FEC_7_8)
133 return -EINVAL; 133 return -EINVAL;
@@ -191,7 +191,7 @@ static int cx22700_get_tps (struct cx22700_state* state, struct dvb_ofdm_paramet
191 FEC_5_6, FEC_7_8 }; 191 FEC_5_6, FEC_7_8 };
192 u8 val; 192 u8 val;
193 193
194 dprintk ("%s\n", __FUNCTION__); 194 dprintk ("%s\n", __func__);
195 195
196 if (!(cx22700_readreg(state, 0x07) & 0x20)) /* tps valid? */ 196 if (!(cx22700_readreg(state, 0x07) & 0x20)) /* tps valid? */
197 return -EAGAIN; 197 return -EAGAIN;