aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/frontends/nxt200x.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/nxt200x.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/nxt200x.c')
-rw-r--r--drivers/media/dvb/frontends/nxt200x.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/drivers/media/dvb/frontends/nxt200x.c b/drivers/media/dvb/frontends/nxt200x.c
index fcf964fe1d6b..23d022852543 100644
--- a/drivers/media/dvb/frontends/nxt200x.c
+++ b/drivers/media/dvb/frontends/nxt200x.c
@@ -74,7 +74,7 @@ static int i2c_writebytes (struct nxt200x_state* state, u8 addr, u8 *buf, u8 len
74 74
75 if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) { 75 if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) {
76 printk (KERN_WARNING "nxt200x: %s: i2c write error (addr 0x%02x, err == %i)\n", 76 printk (KERN_WARNING "nxt200x: %s: i2c write error (addr 0x%02x, err == %i)\n",
77 __FUNCTION__, addr, err); 77 __func__, addr, err);
78 return -EREMOTEIO; 78 return -EREMOTEIO;
79 } 79 }
80 return 0; 80 return 0;
@@ -87,7 +87,7 @@ static u8 i2c_readbytes (struct nxt200x_state* state, u8 addr, u8* buf, u8 len)
87 87
88 if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) { 88 if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) {
89 printk (KERN_WARNING "nxt200x: %s: i2c read error (addr 0x%02x, err == %i)\n", 89 printk (KERN_WARNING "nxt200x: %s: i2c read error (addr 0x%02x, err == %i)\n",
90 __FUNCTION__, addr, err); 90 __func__, addr, err);
91 return -EREMOTEIO; 91 return -EREMOTEIO;
92 } 92 }
93 return 0; 93 return 0;
@@ -104,7 +104,7 @@ static int nxt200x_writebytes (struct nxt200x_state* state, u8 reg, u8 *buf, u8
104 104
105 if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) { 105 if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) {
106 printk (KERN_WARNING "nxt200x: %s: i2c write error (addr 0x%02x, err == %i)\n", 106 printk (KERN_WARNING "nxt200x: %s: i2c write error (addr 0x%02x, err == %i)\n",
107 __FUNCTION__, state->config->demod_address, err); 107 __func__, state->config->demod_address, err);
108 return -EREMOTEIO; 108 return -EREMOTEIO;
109 } 109 }
110 return 0; 110 return 0;
@@ -121,7 +121,7 @@ static u8 nxt200x_readbytes (struct nxt200x_state* state, u8 reg, u8* buf, u8 le
121 121
122 if ((err = i2c_transfer (state->i2c, msg, 2)) != 2) { 122 if ((err = i2c_transfer (state->i2c, msg, 2)) != 2) {
123 printk (KERN_WARNING "nxt200x: %s: i2c read error (addr 0x%02x, err == %i)\n", 123 printk (KERN_WARNING "nxt200x: %s: i2c read error (addr 0x%02x, err == %i)\n",
124 __FUNCTION__, state->config->demod_address, err); 124 __func__, state->config->demod_address, err);
125 return -EREMOTEIO; 125 return -EREMOTEIO;
126 } 126 }
127 return 0; 127 return 0;
@@ -146,7 +146,7 @@ static u16 nxt200x_crc(u16 crc, u8 c)
146static int nxt200x_writereg_multibyte (struct nxt200x_state* state, u8 reg, u8* data, u8 len) 146static int nxt200x_writereg_multibyte (struct nxt200x_state* state, u8 reg, u8* data, u8 len)
147{ 147{
148 u8 attr, len2, buf; 148 u8 attr, len2, buf;
149 dprintk("%s\n", __FUNCTION__); 149 dprintk("%s\n", __func__);
150 150
151 /* set mutli register register */ 151 /* set mutli register register */
152 nxt200x_writebytes(state, 0x35, &reg, 1); 152 nxt200x_writebytes(state, 0x35, &reg, 1);
@@ -207,7 +207,7 @@ static int nxt200x_readreg_multibyte (struct nxt200x_state* state, u8 reg, u8* d
207{ 207{
208 int i; 208 int i;
209 u8 buf, len2, attr; 209 u8 buf, len2, attr;
210 dprintk("%s\n", __FUNCTION__); 210 dprintk("%s\n", __func__);
211 211
212 /* set mutli register register */ 212 /* set mutli register register */
213 nxt200x_writebytes(state, 0x35, &reg, 1); 213 nxt200x_writebytes(state, 0x35, &reg, 1);
@@ -254,7 +254,7 @@ static int nxt200x_readreg_multibyte (struct nxt200x_state* state, u8 reg, u8* d
254static void nxt200x_microcontroller_stop (struct nxt200x_state* state) 254static void nxt200x_microcontroller_stop (struct nxt200x_state* state)
255{ 255{
256 u8 buf, stopval, counter = 0; 256 u8 buf, stopval, counter = 0;
257 dprintk("%s\n", __FUNCTION__); 257 dprintk("%s\n", __func__);
258 258
259 /* set correct stop value */ 259 /* set correct stop value */
260 switch (state->demod_chip) { 260 switch (state->demod_chip) {
@@ -287,7 +287,7 @@ static void nxt200x_microcontroller_stop (struct nxt200x_state* state)
287static void nxt200x_microcontroller_start (struct nxt200x_state* state) 287static void nxt200x_microcontroller_start (struct nxt200x_state* state)
288{ 288{
289 u8 buf; 289 u8 buf;
290 dprintk("%s\n", __FUNCTION__); 290 dprintk("%s\n", __func__);
291 291
292 buf = 0x00; 292 buf = 0x00;
293 nxt200x_writebytes(state, 0x22, &buf, 1); 293 nxt200x_writebytes(state, 0x22, &buf, 1);
@@ -297,7 +297,7 @@ static void nxt2004_microcontroller_init (struct nxt200x_state* state)
297{ 297{
298 u8 buf[9]; 298 u8 buf[9];
299 u8 counter = 0; 299 u8 counter = 0;
300 dprintk("%s\n", __FUNCTION__); 300 dprintk("%s\n", __func__);
301 301
302 buf[0] = 0x00; 302 buf[0] = 0x00;
303 nxt200x_writebytes(state, 0x2b, buf, 1); 303 nxt200x_writebytes(state, 0x2b, buf, 1);
@@ -328,7 +328,7 @@ static int nxt200x_writetuner (struct nxt200x_state* state, u8* data)
328{ 328{
329 u8 buf, count = 0; 329 u8 buf, count = 0;
330 330
331 dprintk("%s\n", __FUNCTION__); 331 dprintk("%s\n", __func__);
332 332
333 dprintk("Tuner Bytes: %02X %02X %02X %02X\n", data[1], data[2], data[3], data[4]); 333 dprintk("Tuner Bytes: %02X %02X %02X %02X\n", data[1], data[2], data[3], data[4]);
334 334
@@ -387,7 +387,7 @@ static int nxt200x_writetuner (struct nxt200x_state* state, u8* data)
387static void nxt200x_agc_reset(struct nxt200x_state* state) 387static void nxt200x_agc_reset(struct nxt200x_state* state)
388{ 388{
389 u8 buf; 389 u8 buf;
390 dprintk("%s\n", __FUNCTION__); 390 dprintk("%s\n", __func__);
391 391
392 switch (state->demod_chip) { 392 switch (state->demod_chip) {
393 case NXT2002: 393 case NXT2002:
@@ -416,7 +416,7 @@ static int nxt2002_load_firmware (struct dvb_frontend* fe, const struct firmware
416 u8 buf[3], written = 0, chunkpos = 0; 416 u8 buf[3], written = 0, chunkpos = 0;
417 u16 rambase, position, crc = 0; 417 u16 rambase, position, crc = 0;
418 418
419 dprintk("%s\n", __FUNCTION__); 419 dprintk("%s\n", __func__);
420 dprintk("Firmware is %zu bytes\n", fw->size); 420 dprintk("Firmware is %zu bytes\n", fw->size);
421 421
422 /* Get the RAM base for this nxt2002 */ 422 /* Get the RAM base for this nxt2002 */
@@ -483,7 +483,7 @@ static int nxt2004_load_firmware (struct dvb_frontend* fe, const struct firmware
483 u8 buf[3]; 483 u8 buf[3];
484 u16 rambase, position, crc=0; 484 u16 rambase, position, crc=0;
485 485
486 dprintk("%s\n", __FUNCTION__); 486 dprintk("%s\n", __func__);
487 dprintk("Firmware is %zu bytes\n", fw->size); 487 dprintk("Firmware is %zu bytes\n", fw->size);
488 488
489 /* set rambase */ 489 /* set rambase */