aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/frontends/sp887x.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/sp887x.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/sp887x.c')
-rw-r--r--drivers/media/dvb/frontends/sp887x.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/media/dvb/frontends/sp887x.c b/drivers/media/dvb/frontends/sp887x.c
index 1aa2539f5099..49f55877f513 100644
--- a/drivers/media/dvb/frontends/sp887x.c
+++ b/drivers/media/dvb/frontends/sp887x.c
@@ -43,7 +43,7 @@ static int i2c_writebytes (struct sp887x_state* state, u8 *buf, u8 len)
43 43
44 if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) { 44 if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) {
45 printk ("%s: i2c write error (addr %02x, err == %i)\n", 45 printk ("%s: i2c write error (addr %02x, err == %i)\n",
46 __FUNCTION__, state->config->demod_address, err); 46 __func__, state->config->demod_address, err);
47 return -EREMOTEIO; 47 return -EREMOTEIO;
48 } 48 }
49 49
@@ -65,7 +65,7 @@ static int sp887x_writereg (struct sp887x_state* state, u16 reg, u16 data)
65 { 65 {
66 printk("%s: writereg error " 66 printk("%s: writereg error "
67 "(reg %03x, data %03x, ret == %i)\n", 67 "(reg %03x, data %03x, ret == %i)\n",
68 __FUNCTION__, reg & 0xffff, data & 0xffff, ret); 68 __func__, reg & 0xffff, data & 0xffff, ret);
69 return ret; 69 return ret;
70 } 70 }
71 } 71 }
@@ -82,7 +82,7 @@ static int sp887x_readreg (struct sp887x_state* state, u16 reg)
82 { .addr = state->config->demod_address, .flags = I2C_M_RD, .buf = b1, .len = 2 }}; 82 { .addr = state->config->demod_address, .flags = I2C_M_RD, .buf = b1, .len = 2 }};
83 83
84 if ((ret = i2c_transfer(state->i2c, msg, 2)) != 2) { 84 if ((ret = i2c_transfer(state->i2c, msg, 2)) != 2) {
85 printk("%s: readreg error (ret == %i)\n", __FUNCTION__, ret); 85 printk("%s: readreg error (ret == %i)\n", __func__, ret);
86 return -1; 86 return -1;
87 } 87 }
88 88
@@ -91,7 +91,7 @@ static int sp887x_readreg (struct sp887x_state* state, u16 reg)
91 91
92static void sp887x_microcontroller_stop (struct sp887x_state* state) 92static void sp887x_microcontroller_stop (struct sp887x_state* state)
93{ 93{
94 dprintk("%s\n", __FUNCTION__); 94 dprintk("%s\n", __func__);
95 sp887x_writereg(state, 0xf08, 0x000); 95 sp887x_writereg(state, 0xf08, 0x000);
96 sp887x_writereg(state, 0xf09, 0x000); 96 sp887x_writereg(state, 0xf09, 0x000);
97 97
@@ -101,7 +101,7 @@ static void sp887x_microcontroller_stop (struct sp887x_state* state)
101 101
102static void sp887x_microcontroller_start (struct sp887x_state* state) 102static void sp887x_microcontroller_start (struct sp887x_state* state)
103{ 103{
104 dprintk("%s\n", __FUNCTION__); 104 dprintk("%s\n", __func__);
105 sp887x_writereg(state, 0xf08, 0x000); 105 sp887x_writereg(state, 0xf08, 0x000);
106 sp887x_writereg(state, 0xf09, 0x000); 106 sp887x_writereg(state, 0xf09, 0x000);
107 107
@@ -112,7 +112,7 @@ static void sp887x_microcontroller_start (struct sp887x_state* state)
112static void sp887x_setup_agc (struct sp887x_state* state) 112static void sp887x_setup_agc (struct sp887x_state* state)
113{ 113{
114 /* setup AGC parameters */ 114 /* setup AGC parameters */
115 dprintk("%s\n", __FUNCTION__); 115 dprintk("%s\n", __func__);
116 sp887x_writereg(state, 0x33c, 0x054); 116 sp887x_writereg(state, 0x33c, 0x054);
117 sp887x_writereg(state, 0x33b, 0x04c); 117 sp887x_writereg(state, 0x33b, 0x04c);
118 sp887x_writereg(state, 0x328, 0x000); 118 sp887x_writereg(state, 0x328, 0x000);
@@ -142,7 +142,7 @@ static int sp887x_initial_setup (struct dvb_frontend* fe, const struct firmware
142 int fw_size = fw->size; 142 int fw_size = fw->size;
143 unsigned char *mem = fw->data; 143 unsigned char *mem = fw->data;
144 144
145 dprintk("%s\n", __FUNCTION__); 145 dprintk("%s\n", __func__);
146 146
147 /* ignore the first 10 bytes, then we expect 0x4000 bytes of firmware */ 147 /* ignore the first 10 bytes, then we expect 0x4000 bytes of firmware */
148 if (fw_size < FW_SIZE+10) 148 if (fw_size < FW_SIZE+10)
@@ -155,7 +155,7 @@ static int sp887x_initial_setup (struct dvb_frontend* fe, const struct firmware
155 155
156 sp887x_microcontroller_stop (state); 156 sp887x_microcontroller_stop (state);
157 157
158 printk ("%s: firmware upload... ", __FUNCTION__); 158 printk ("%s: firmware upload... ", __func__);
159 159
160 /* setup write pointer to -1 (end of memory) */ 160 /* setup write pointer to -1 (end of memory) */
161 /* bit 0x8000 in address is set to enable 13bit mode */ 161 /* bit 0x8000 in address is set to enable 13bit mode */
@@ -181,7 +181,7 @@ static int sp887x_initial_setup (struct dvb_frontend* fe, const struct firmware
181 181
182 if ((err = i2c_writebytes (state, buf, c+2)) < 0) { 182 if ((err = i2c_writebytes (state, buf, c+2)) < 0) {
183 printk ("failed.\n"); 183 printk ("failed.\n");
184 printk ("%s: i2c error (err == %i)\n", __FUNCTION__, err); 184 printk ("%s: i2c error (err == %i)\n", __func__, err);
185 return err; 185 return err;
186 } 186 }
187 } 187 }