diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-04-08 22:20:00 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-24 13:07:58 -0400 |
commit | 7bca4498f6ec331c2ace79824da8687ad35cd65c (patch) | |
tree | 405ab5f79ba2a5f8246babb62e11392e882f34f9 /drivers | |
parent | 536a0b119527c8af8e3a70b18f7640a21039a0a7 (diff) |
V4L/DVB (7509): media/dvb/b2c2 replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/media/dvb/b2c2/flexcop-dma.c | 4 | ||||
-rw-r--r-- | drivers/media/dvb/b2c2/flexcop-sram.c | 28 |
2 files changed, 16 insertions, 16 deletions
diff --git a/drivers/media/dvb/b2c2/flexcop-dma.c b/drivers/media/dvb/b2c2/flexcop-dma.c index 6f592bc32d22..a91ed28f03a4 100644 --- a/drivers/media/dvb/b2c2/flexcop-dma.c +++ b/drivers/media/dvb/b2c2/flexcop-dma.c | |||
@@ -112,7 +112,7 @@ static int flexcop_dma_remap(struct flexcop_device *fc, | |||
112 | { | 112 | { |
113 | flexcop_ibi_register r = (dma_idx & FC_DMA_1) ? dma1_00c : dma2_01c; | 113 | flexcop_ibi_register r = (dma_idx & FC_DMA_1) ? dma1_00c : dma2_01c; |
114 | flexcop_ibi_value v = fc->read_ibi_reg(fc,r); | 114 | flexcop_ibi_value v = fc->read_ibi_reg(fc,r); |
115 | deb_info("%s\n",__FUNCTION__); | 115 | deb_info("%s\n",__func__); |
116 | v.dma_0xc.remap_enable = onoff; | 116 | v.dma_0xc.remap_enable = onoff; |
117 | fc->write_ibi_reg(fc,r,v); | 117 | fc->write_ibi_reg(fc,r,v); |
118 | return 0; | 118 | return 0; |
@@ -162,7 +162,7 @@ int flexcop_dma_config_timer(struct flexcop_device *fc, | |||
162 | 162 | ||
163 | flexcop_dma_remap(fc,dma_idx,0); | 163 | flexcop_dma_remap(fc,dma_idx,0); |
164 | 164 | ||
165 | deb_info("%s\n",__FUNCTION__); | 165 | deb_info("%s\n",__func__); |
166 | v.dma_0x4_write.dmatimer = cycles; | 166 | v.dma_0x4_write.dmatimer = cycles; |
167 | fc->write_ibi_reg(fc,r,v); | 167 | fc->write_ibi_reg(fc,r,v); |
168 | return 0; | 168 | return 0; |
diff --git a/drivers/media/dvb/b2c2/flexcop-sram.c b/drivers/media/dvb/b2c2/flexcop-sram.c index 01570ec80962..cda69528548a 100644 --- a/drivers/media/dvb/b2c2/flexcop-sram.c +++ b/drivers/media/dvb/b2c2/flexcop-sram.c | |||
@@ -90,7 +90,7 @@ static void flexcop_sram_write(struct adapter *adapter, u32 bank, u32 addr, u8 * | |||
90 | }; | 90 | }; |
91 | 91 | ||
92 | if (retries == 0) | 92 | if (retries == 0) |
93 | printk("%s: SRAM timeout\n", __FUNCTION__); | 93 | printk("%s: SRAM timeout\n", __func__); |
94 | 94 | ||
95 | write_reg_dw(adapter, 0x700, command); | 95 | write_reg_dw(adapter, 0x700, command); |
96 | 96 | ||
@@ -115,7 +115,7 @@ static void flex_sram_read(struct adapter *adapter, u32 bank, u32 addr, u8 *buf, | |||
115 | }; | 115 | }; |
116 | 116 | ||
117 | if (retries == 0) | 117 | if (retries == 0) |
118 | printk("%s: SRAM timeout\n", __FUNCTION__); | 118 | printk("%s: SRAM timeout\n", __func__); |
119 | 119 | ||
120 | write_reg_dw(adapter, 0x700, command); | 120 | write_reg_dw(adapter, 0x700, command); |
121 | 121 | ||
@@ -127,7 +127,7 @@ static void flex_sram_read(struct adapter *adapter, u32 bank, u32 addr, u8 *buf, | |||
127 | }; | 127 | }; |
128 | 128 | ||
129 | if (retries == 0) | 129 | if (retries == 0) |
130 | printk("%s: SRAM timeout\n", __FUNCTION__); | 130 | printk("%s: SRAM timeout\n", __func__); |
131 | 131 | ||
132 | value = read_reg_dw(adapter, 0x700) >> 0x10; | 132 | value = read_reg_dw(adapter, 0x700) >> 0x10; |
133 | 133 | ||
@@ -240,13 +240,13 @@ static void sram_init(struct adapter *adapter) | |||
240 | 240 | ||
241 | adapter->dw_sram_type = tmp & 0x30000; | 241 | adapter->dw_sram_type = tmp & 0x30000; |
242 | 242 | ||
243 | ddprintk("%s: dw_sram_type = %x\n", __FUNCTION__, adapter->dw_sram_type); | 243 | ddprintk("%s: dw_sram_type = %x\n", __func__, adapter->dw_sram_type); |
244 | 244 | ||
245 | } else { | 245 | } else { |
246 | 246 | ||
247 | adapter->dw_sram_type = 0x10000; | 247 | adapter->dw_sram_type = 0x10000; |
248 | 248 | ||
249 | ddprintk("%s: dw_sram_type = %x\n", __FUNCTION__, adapter->dw_sram_type); | 249 | ddprintk("%s: dw_sram_type = %x\n", __func__, adapter->dw_sram_type); |
250 | } | 250 | } |
251 | 251 | ||
252 | /* return value is never used? */ | 252 | /* return value is never used? */ |
@@ -257,7 +257,7 @@ static int sram_test_location(struct adapter *adapter, u32 mask, u32 addr) | |||
257 | { | 257 | { |
258 | u8 tmp1, tmp2; | 258 | u8 tmp1, tmp2; |
259 | 259 | ||
260 | dprintk("%s: mask = %x, addr = %x\n", __FUNCTION__, mask, addr); | 260 | dprintk("%s: mask = %x, addr = %x\n", __func__, mask, addr); |
261 | 261 | ||
262 | sram_set_size(adapter, mask); | 262 | sram_set_size(adapter, mask); |
263 | sram_init(adapter); | 263 | sram_init(adapter); |
@@ -275,7 +275,7 @@ static int sram_test_location(struct adapter *adapter, u32 mask, u32 addr) | |||
275 | sram_read(adapter, addr, &tmp2, 1); | 275 | sram_read(adapter, addr, &tmp2, 1); |
276 | sram_read(adapter, addr, &tmp2, 1); | 276 | sram_read(adapter, addr, &tmp2, 1); |
277 | 277 | ||
278 | dprintk("%s: wrote 0xa5, read 0x%2x\n", __FUNCTION__, tmp2); | 278 | dprintk("%s: wrote 0xa5, read 0x%2x\n", __func__, tmp2); |
279 | 279 | ||
280 | if (tmp2 != 0xa5) | 280 | if (tmp2 != 0xa5) |
281 | return 0; | 281 | return 0; |
@@ -293,7 +293,7 @@ static int sram_test_location(struct adapter *adapter, u32 mask, u32 addr) | |||
293 | sram_read(adapter, addr, &tmp2, 1); | 293 | sram_read(adapter, addr, &tmp2, 1); |
294 | sram_read(adapter, addr, &tmp2, 1); | 294 | sram_read(adapter, addr, &tmp2, 1); |
295 | 295 | ||
296 | dprintk("%s: wrote 0x5a, read 0x%2x\n", __FUNCTION__, tmp2); | 296 | dprintk("%s: wrote 0x5a, read 0x%2x\n", __func__, tmp2); |
297 | 297 | ||
298 | if (tmp2 != 0x5a) | 298 | if (tmp2 != 0x5a) |
299 | return 0; | 299 | return 0; |
@@ -340,7 +340,7 @@ static int flexcop_sram_detect(struct flexcop_device *fc) | |||
340 | 340 | ||
341 | tmp3 = read_reg_dw(adapter, 0x71c); | 341 | tmp3 = read_reg_dw(adapter, 0x71c); |
342 | 342 | ||
343 | dprintk("%s: tmp3 = %x\n", __FUNCTION__, tmp3); | 343 | dprintk("%s: tmp3 = %x\n", __func__, tmp3); |
344 | 344 | ||
345 | write_reg_dw(adapter, 0x71c, tmp2); | 345 | write_reg_dw(adapter, 0x71c, tmp2); |
346 | 346 | ||
@@ -351,7 +351,7 @@ static int flexcop_sram_detect(struct flexcop_device *fc) | |||
351 | sram_init(adapter); | 351 | sram_init(adapter); |
352 | write_reg_dw(adapter, 0x208, tmp); | 352 | write_reg_dw(adapter, 0x208, tmp); |
353 | 353 | ||
354 | dprintk("%s: sram size = 32K\n", __FUNCTION__); | 354 | dprintk("%s: sram size = 32K\n", __func__); |
355 | 355 | ||
356 | return 32; | 356 | return 32; |
357 | } | 357 | } |
@@ -361,7 +361,7 @@ static int flexcop_sram_detect(struct flexcop_device *fc) | |||
361 | sram_init(adapter); | 361 | sram_init(adapter); |
362 | write_reg_dw(adapter, 0x208, tmp); | 362 | write_reg_dw(adapter, 0x208, tmp); |
363 | 363 | ||
364 | dprintk("%s: sram size = 128K\n", __FUNCTION__); | 364 | dprintk("%s: sram size = 128K\n", __func__); |
365 | 365 | ||
366 | return 128; | 366 | return 128; |
367 | } | 367 | } |
@@ -371,7 +371,7 @@ static int flexcop_sram_detect(struct flexcop_device *fc) | |||
371 | sram_init(adapter); | 371 | sram_init(adapter); |
372 | write_reg_dw(adapter, 0x208, tmp); | 372 | write_reg_dw(adapter, 0x208, tmp); |
373 | 373 | ||
374 | dprintk("%s: sram size = 64K\n", __FUNCTION__); | 374 | dprintk("%s: sram size = 64K\n", __func__); |
375 | 375 | ||
376 | return 64; | 376 | return 64; |
377 | } | 377 | } |
@@ -381,7 +381,7 @@ static int flexcop_sram_detect(struct flexcop_device *fc) | |||
381 | sram_init(adapter); | 381 | sram_init(adapter); |
382 | write_reg_dw(adapter, 0x208, tmp); | 382 | write_reg_dw(adapter, 0x208, tmp); |
383 | 383 | ||
384 | dprintk("%s: sram size = 32K\n", __FUNCTION__); | 384 | dprintk("%s: sram size = 32K\n", __func__); |
385 | 385 | ||
386 | return 32; | 386 | return 32; |
387 | } | 387 | } |
@@ -390,7 +390,7 @@ static int flexcop_sram_detect(struct flexcop_device *fc) | |||
390 | sram_init(adapter); | 390 | sram_init(adapter); |
391 | write_reg_dw(adapter, 0x208, tmp); | 391 | write_reg_dw(adapter, 0x208, tmp); |
392 | 392 | ||
393 | dprintk("%s: SRAM detection failed. Set to 32K \n", __FUNCTION__); | 393 | dprintk("%s: SRAM detection failed. Set to 32K \n", __func__); |
394 | 394 | ||
395 | return 0; | 395 | return 0; |
396 | } | 396 | } |