aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/ttpci
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
commit3ca7fc84e37c5cf446fe4137f885f74e71373d7f (patch)
tree236bae57740ccd8308c740fc635a43c84b136b10 /drivers/media/dvb/ttpci
parent271ddbf702c3a4e6b18f6464180eda0f62efd9a5 (diff)
V4L/DVB (7515): media/dvb/ttpci 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/ttpci')
-rw-r--r--drivers/media/dvb/ttpci/av7110.c12
-rw-r--r--drivers/media/dvb/ttpci/av7110.h2
-rw-r--r--drivers/media/dvb/ttpci/av7110_hw.c42
-rw-r--r--drivers/media/dvb/ttpci/av7110_ir.c6
-rw-r--r--drivers/media/dvb/ttpci/av7110_v4l.c4
-rw-r--r--drivers/media/dvb/ttpci/budget-ci.c2
-rw-r--r--drivers/media/dvb/ttpci/budget-core.c2
-rw-r--r--drivers/media/dvb/ttpci/budget.c6
-rw-r--r--drivers/media/dvb/ttpci/budget.h3
-rw-r--r--drivers/media/dvb/ttpci/ttpci-eeprom.c2
10 files changed, 41 insertions, 40 deletions
diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c
index 0e5701bdff19..78919b9e14dc 100644
--- a/drivers/media/dvb/ttpci/av7110.c
+++ b/drivers/media/dvb/ttpci/av7110.c
@@ -359,7 +359,7 @@ static inline void start_debi_dma(struct av7110 *av7110, int dir,
359{ 359{
360 dprintk(8, "%c %08lx %u\n", dir == DEBI_READ ? 'R' : 'W', addr, len); 360 dprintk(8, "%c %08lx %u\n", dir == DEBI_READ ? 'R' : 'W', addr, len);
361 if (saa7146_wait_for_debi_done(av7110->dev, 0)) { 361 if (saa7146_wait_for_debi_done(av7110->dev, 0)) {
362 printk(KERN_ERR "%s: saa7146_wait_for_debi_done timed out\n", __FUNCTION__); 362 printk(KERN_ERR "%s: saa7146_wait_for_debi_done timed out\n", __func__);
363 return; 363 return;
364 } 364 }
365 365
@@ -497,7 +497,7 @@ static void gpioirq(unsigned long data)
497 saa7146_read(av7110->dev, SSR)); 497 saa7146_read(av7110->dev, SSR));
498 498
499 if (saa7146_wait_for_debi_done(av7110->dev, 0)) { 499 if (saa7146_wait_for_debi_done(av7110->dev, 0)) {
500 printk(KERN_ERR "%s: saa7146_wait_for_debi_done timed out\n", __FUNCTION__); 500 printk(KERN_ERR "%s: saa7146_wait_for_debi_done timed out\n", __func__);
501 BUG(); /* maybe we should try resetting the debi? */ 501 BUG(); /* maybe we should try resetting the debi? */
502 } 502 }
503 503
@@ -827,7 +827,7 @@ static int StartHWFilter(struct dvb_demux_filter *dvbdmxfilter)
827 if (ret != 0 || handle >= 32) { 827 if (ret != 0 || handle >= 32) {
828 printk("dvb-ttpci: %s error buf %04x %04x %04x %04x " 828 printk("dvb-ttpci: %s error buf %04x %04x %04x %04x "
829 "ret %d handle %04x\n", 829 "ret %d handle %04x\n",
830 __FUNCTION__, buf[0], buf[1], buf[2], buf[3], 830 __func__, buf[0], buf[1], buf[2], buf[3],
831 ret, handle); 831 ret, handle);
832 dvbdmxfilter->hw_handle = 0xffff; 832 dvbdmxfilter->hw_handle = 0xffff;
833 if (!ret) 833 if (!ret)
@@ -854,7 +854,7 @@ static int StopHWFilter(struct dvb_demux_filter *dvbdmxfilter)
854 handle = dvbdmxfilter->hw_handle; 854 handle = dvbdmxfilter->hw_handle;
855 if (handle >= 32) { 855 if (handle >= 32) {
856 printk("%s tried to stop invalid filter %04x, filter type = %x\n", 856 printk("%s tried to stop invalid filter %04x, filter type = %x\n",
857 __FUNCTION__, handle, dvbdmxfilter->type); 857 __func__, handle, dvbdmxfilter->type);
858 return -EINVAL; 858 return -EINVAL;
859 } 859 }
860 860
@@ -867,7 +867,7 @@ static int StopHWFilter(struct dvb_demux_filter *dvbdmxfilter)
867 if (ret != 0 || answ[1] != handle) { 867 if (ret != 0 || answ[1] != handle) {
868 printk("dvb-ttpci: %s error cmd %04x %04x %04x ret %x " 868 printk("dvb-ttpci: %s error cmd %04x %04x %04x ret %x "
869 "resp %04x %04x pid %d\n", 869 "resp %04x %04x pid %d\n",
870 __FUNCTION__, buf[0], buf[1], buf[2], ret, 870 __func__, buf[0], buf[1], buf[2], ret,
871 answ[0], answ[1], dvbdmxfilter->feed->pid); 871 answ[0], answ[1], dvbdmxfilter->feed->pid);
872 if (!ret) 872 if (!ret)
873 ret = -1; 873 ret = -1;
@@ -1122,7 +1122,7 @@ static int dvb_get_stc(struct dmx_demux *demux, unsigned int num,
1122 1122
1123 ret = av7110_fw_request(av7110, &tag, 0, fwstc, 4); 1123 ret = av7110_fw_request(av7110, &tag, 0, fwstc, 4);
1124 if (ret) { 1124 if (ret) {
1125 printk(KERN_ERR "%s: av7110_fw_request error\n", __FUNCTION__); 1125 printk(KERN_ERR "%s: av7110_fw_request error\n", __func__);
1126 return ret; 1126 return ret;
1127 } 1127 }
1128 dprintk(2, "fwstc = %04hx %04hx %04hx %04hx\n", 1128 dprintk(2, "fwstc = %04hx %04hx %04hx %04hx\n",
diff --git a/drivers/media/dvb/ttpci/av7110.h b/drivers/media/dvb/ttpci/av7110.h
index 39fbf7d5cffb..e494e04eeee8 100644
--- a/drivers/media/dvb/ttpci/av7110.h
+++ b/drivers/media/dvb/ttpci/av7110.h
@@ -40,7 +40,7 @@
40extern int av7110_debug; 40extern int av7110_debug;
41 41
42#define dprintk(level,args...) \ 42#define dprintk(level,args...) \
43 do { if ((av7110_debug & level)) { printk("dvb-ttpci: %s(): ", __FUNCTION__); printk(args); } } while (0) 43 do { if ((av7110_debug & level)) { printk("dvb-ttpci: %s(): ", __func__); printk(args); } } while (0)
44 44
45#define MAXFILT 32 45#define MAXFILT 32
46 46
diff --git a/drivers/media/dvb/ttpci/av7110_hw.c b/drivers/media/dvb/ttpci/av7110_hw.c
index a468aa2e4854..9d81074b31df 100644
--- a/drivers/media/dvb/ttpci/av7110_hw.c
+++ b/drivers/media/dvb/ttpci/av7110_hw.c
@@ -53,11 +53,11 @@ int av7110_debiwrite(struct av7110 *av7110, u32 config,
53 struct saa7146_dev *dev = av7110->dev; 53 struct saa7146_dev *dev = av7110->dev;
54 54
55 if (count <= 0 || count > 32764) { 55 if (count <= 0 || count > 32764) {
56 printk("%s: invalid count %d\n", __FUNCTION__, count); 56 printk("%s: invalid count %d\n", __func__, count);
57 return -1; 57 return -1;
58 } 58 }
59 if (saa7146_wait_for_debi_done(av7110->dev, 0) < 0) { 59 if (saa7146_wait_for_debi_done(av7110->dev, 0) < 0) {
60 printk("%s: wait_for_debi_done failed\n", __FUNCTION__); 60 printk("%s: wait_for_debi_done failed\n", __func__);
61 return -1; 61 return -1;
62 } 62 }
63 saa7146_write(dev, DEBI_CONFIG, config); 63 saa7146_write(dev, DEBI_CONFIG, config);
@@ -76,11 +76,11 @@ u32 av7110_debiread(struct av7110 *av7110, u32 config, int addr, int count)
76 u32 result = 0; 76 u32 result = 0;
77 77
78 if (count > 32764 || count <= 0) { 78 if (count > 32764 || count <= 0) {
79 printk("%s: invalid count %d\n", __FUNCTION__, count); 79 printk("%s: invalid count %d\n", __func__, count);
80 return 0; 80 return 0;
81 } 81 }
82 if (saa7146_wait_for_debi_done(av7110->dev, 0) < 0) { 82 if (saa7146_wait_for_debi_done(av7110->dev, 0) < 0) {
83 printk("%s: wait_for_debi_done #1 failed\n", __FUNCTION__); 83 printk("%s: wait_for_debi_done #1 failed\n", __func__);
84 return 0; 84 return 0;
85 } 85 }
86 saa7146_write(dev, DEBI_AD, av7110->debi_bus); 86 saa7146_write(dev, DEBI_AD, av7110->debi_bus);
@@ -91,7 +91,7 @@ u32 av7110_debiread(struct av7110 *av7110, u32 config, int addr, int count)
91 if (count > 4) 91 if (count > 4)
92 return count; 92 return count;
93 if (saa7146_wait_for_debi_done(av7110->dev, 0) < 0) { 93 if (saa7146_wait_for_debi_done(av7110->dev, 0) < 0) {
94 printk("%s: wait_for_debi_done #2 failed\n", __FUNCTION__); 94 printk("%s: wait_for_debi_done #2 failed\n", __func__);
95 return 0; 95 return 0;
96 } 96 }
97 97
@@ -332,7 +332,7 @@ int av7110_wait_msgstate(struct av7110 *av7110, u16 flags)
332 break; 332 break;
333 if (err) { 333 if (err) {
334 printk(KERN_ERR "%s: timeout waiting for MSGSTATE %04x\n", 334 printk(KERN_ERR "%s: timeout waiting for MSGSTATE %04x\n",
335 __FUNCTION__, stat & flags); 335 __func__, stat & flags);
336 return -ETIMEDOUT; 336 return -ETIMEDOUT;
337 } 337 }
338 msleep(1); 338 msleep(1);
@@ -362,7 +362,7 @@ static int __av7110_send_fw_cmd(struct av7110 *av7110, u16* buf, int length)
362 if (rdebi(av7110, DEBINOSWAP, COMMAND, 0, 2) == 0) 362 if (rdebi(av7110, DEBINOSWAP, COMMAND, 0, 2) == 0)
363 break; 363 break;
364 if (err) { 364 if (err) {
365 printk(KERN_ERR "dvb-ttpci: %s(): timeout waiting for COMMAND idle\n", __FUNCTION__); 365 printk(KERN_ERR "dvb-ttpci: %s(): timeout waiting for COMMAND idle\n", __func__);
366 av7110->arm_errors++; 366 av7110->arm_errors++;
367 return -ETIMEDOUT; 367 return -ETIMEDOUT;
368 } 368 }
@@ -379,7 +379,7 @@ static int __av7110_send_fw_cmd(struct av7110 *av7110, u16* buf, int length)
379 if (rdebi(av7110, DEBINOSWAP, HANDSHAKE_REG, 0, 2) == 0) 379 if (rdebi(av7110, DEBINOSWAP, HANDSHAKE_REG, 0, 2) == 0)
380 break; 380 break;
381 if (err) { 381 if (err) {
382 printk(KERN_ERR "dvb-ttpci: %s(): timeout waiting for HANDSHAKE_REG\n", __FUNCTION__); 382 printk(KERN_ERR "dvb-ttpci: %s(): timeout waiting for HANDSHAKE_REG\n", __func__);
383 return -ETIMEDOUT; 383 return -ETIMEDOUT;
384 } 384 }
385 msleep(1); 385 msleep(1);
@@ -419,14 +419,14 @@ static int __av7110_send_fw_cmd(struct av7110 *av7110, u16* buf, int length)
419 stat = rdebi(av7110, DEBINOSWAP, MSGSTATE, 0, 2); 419 stat = rdebi(av7110, DEBINOSWAP, MSGSTATE, 0, 2);
420 if (stat & flags[0]) { 420 if (stat & flags[0]) {
421 printk(KERN_ERR "%s: %s QUEUE overflow\n", 421 printk(KERN_ERR "%s: %s QUEUE overflow\n",
422 __FUNCTION__, type); 422 __func__, type);
423 return -1; 423 return -1;
424 } 424 }
425 if ((stat & flags[1]) == 0) 425 if ((stat & flags[1]) == 0)
426 break; 426 break;
427 if (err) { 427 if (err) {
428 printk(KERN_ERR "%s: timeout waiting on busy %s QUEUE\n", 428 printk(KERN_ERR "%s: timeout waiting on busy %s QUEUE\n",
429 __FUNCTION__, type); 429 __func__, type);
430 return -ETIMEDOUT; 430 return -ETIMEDOUT;
431 } 431 }
432 msleep(1); 432 msleep(1);
@@ -454,7 +454,7 @@ static int __av7110_send_fw_cmd(struct av7110 *av7110, u16* buf, int length)
454 break; 454 break;
455 if (err) { 455 if (err) {
456 printk(KERN_ERR "dvb-ttpci: %s(): timeout waiting for COMMAND %d to complete\n", 456 printk(KERN_ERR "dvb-ttpci: %s(): timeout waiting for COMMAND %d to complete\n",
457 __FUNCTION__, (buf[0] >> 8) & 0xff); 457 __func__, (buf[0] >> 8) & 0xff);
458 return -ETIMEDOUT; 458 return -ETIMEDOUT;
459 } 459 }
460 msleep(1); 460 msleep(1);
@@ -462,11 +462,11 @@ static int __av7110_send_fw_cmd(struct av7110 *av7110, u16* buf, int length)
462 462
463 stat = rdebi(av7110, DEBINOSWAP, MSGSTATE, 0, 2); 463 stat = rdebi(av7110, DEBINOSWAP, MSGSTATE, 0, 2);
464 if (stat & GPMQOver) { 464 if (stat & GPMQOver) {
465 printk(KERN_ERR "dvb-ttpci: %s(): GPMQOver\n", __FUNCTION__); 465 printk(KERN_ERR "dvb-ttpci: %s(): GPMQOver\n", __func__);
466 return -ENOSPC; 466 return -ENOSPC;
467 } 467 }
468 else if (stat & OSDQOver) { 468 else if (stat & OSDQOver) {
469 printk(KERN_ERR "dvb-ttpci: %s(): OSDQOver\n", __FUNCTION__); 469 printk(KERN_ERR "dvb-ttpci: %s(): OSDQOver\n", __func__);
470 return -ENOSPC; 470 return -ENOSPC;
471 } 471 }
472#endif 472#endif
@@ -491,7 +491,7 @@ static int av7110_send_fw_cmd(struct av7110 *av7110, u16* buf, int length)
491 mutex_unlock(&av7110->dcomlock); 491 mutex_unlock(&av7110->dcomlock);
492 if (ret && ret!=-ERESTARTSYS) 492 if (ret && ret!=-ERESTARTSYS)
493 printk(KERN_ERR "dvb-ttpci: %s(): av7110_send_fw_cmd error %d\n", 493 printk(KERN_ERR "dvb-ttpci: %s(): av7110_send_fw_cmd error %d\n",
494 __FUNCTION__, ret); 494 __func__, ret);
495 return ret; 495 return ret;
496} 496}
497 497
@@ -575,7 +575,7 @@ int av7110_fw_request(struct av7110 *av7110, u16 *request_buf,
575 if (rdebi(av7110, DEBINOSWAP, COMMAND, 0, 2) == 0) 575 if (rdebi(av7110, DEBINOSWAP, COMMAND, 0, 2) == 0)
576 break; 576 break;
577 if (err) { 577 if (err) {
578 printk(KERN_ERR "%s: timeout waiting for COMMAND to complete\n", __FUNCTION__); 578 printk(KERN_ERR "%s: timeout waiting for COMMAND to complete\n", __func__);
579 mutex_unlock(&av7110->dcomlock); 579 mutex_unlock(&av7110->dcomlock);
580 return -ETIMEDOUT; 580 return -ETIMEDOUT;
581 } 581 }
@@ -591,7 +591,7 @@ int av7110_fw_request(struct av7110 *av7110, u16 *request_buf,
591 if (rdebi(av7110, DEBINOSWAP, HANDSHAKE_REG, 0, 2) == 0) 591 if (rdebi(av7110, DEBINOSWAP, HANDSHAKE_REG, 0, 2) == 0)
592 break; 592 break;
593 if (err) { 593 if (err) {
594 printk(KERN_ERR "%s: timeout waiting for HANDSHAKE_REG\n", __FUNCTION__); 594 printk(KERN_ERR "%s: timeout waiting for HANDSHAKE_REG\n", __func__);
595 mutex_unlock(&av7110->dcomlock); 595 mutex_unlock(&av7110->dcomlock);
596 return -ETIMEDOUT; 596 return -ETIMEDOUT;
597 } 597 }
@@ -602,12 +602,12 @@ int av7110_fw_request(struct av7110 *av7110, u16 *request_buf,
602#ifdef COM_DEBUG 602#ifdef COM_DEBUG
603 stat = rdebi(av7110, DEBINOSWAP, MSGSTATE, 0, 2); 603 stat = rdebi(av7110, DEBINOSWAP, MSGSTATE, 0, 2);
604 if (stat & GPMQOver) { 604 if (stat & GPMQOver) {
605 printk(KERN_ERR "%s: GPMQOver\n", __FUNCTION__); 605 printk(KERN_ERR "%s: GPMQOver\n", __func__);
606 mutex_unlock(&av7110->dcomlock); 606 mutex_unlock(&av7110->dcomlock);
607 return -1; 607 return -1;
608 } 608 }
609 else if (stat & OSDQOver) { 609 else if (stat & OSDQOver) {
610 printk(KERN_ERR "%s: OSDQOver\n", __FUNCTION__); 610 printk(KERN_ERR "%s: OSDQOver\n", __func__);
611 mutex_unlock(&av7110->dcomlock); 611 mutex_unlock(&av7110->dcomlock);
612 return -1; 612 return -1;
613 } 613 }
@@ -741,7 +741,7 @@ static int FlushText(struct av7110 *av7110)
741 break; 741 break;
742 if (err) { 742 if (err) {
743 printk(KERN_ERR "dvb-ttpci: %s(): timeout waiting for BUFF1_BASE == 0\n", 743 printk(KERN_ERR "dvb-ttpci: %s(): timeout waiting for BUFF1_BASE == 0\n",
744 __FUNCTION__); 744 __func__);
745 mutex_unlock(&av7110->dcomlock); 745 mutex_unlock(&av7110->dcomlock);
746 return -ETIMEDOUT; 746 return -ETIMEDOUT;
747 } 747 }
@@ -768,7 +768,7 @@ static int WriteText(struct av7110 *av7110, u8 win, u16 x, u16 y, char *buf)
768 break; 768 break;
769 if (ret) { 769 if (ret) {
770 printk(KERN_ERR "dvb-ttpci: %s: timeout waiting for BUFF1_BASE == 0\n", 770 printk(KERN_ERR "dvb-ttpci: %s: timeout waiting for BUFF1_BASE == 0\n",
771 __FUNCTION__); 771 __func__);
772 mutex_unlock(&av7110->dcomlock); 772 mutex_unlock(&av7110->dcomlock);
773 return -ETIMEDOUT; 773 return -ETIMEDOUT;
774 } 774 }
@@ -782,7 +782,7 @@ static int WriteText(struct av7110 *av7110, u8 win, u16 x, u16 y, char *buf)
782 break; 782 break;
783 if (ret) { 783 if (ret) {
784 printk(KERN_ERR "dvb-ttpci: %s: timeout waiting for HANDSHAKE_REG\n", 784 printk(KERN_ERR "dvb-ttpci: %s: timeout waiting for HANDSHAKE_REG\n",
785 __FUNCTION__); 785 __func__);
786 mutex_unlock(&av7110->dcomlock); 786 mutex_unlock(&av7110->dcomlock);
787 return -ETIMEDOUT; 787 return -ETIMEDOUT;
788 } 788 }
diff --git a/drivers/media/dvb/ttpci/av7110_ir.c b/drivers/media/dvb/ttpci/av7110_ir.c
index a283e1de83fa..23a1c6380d3f 100644
--- a/drivers/media/dvb/ttpci/av7110_ir.c
+++ b/drivers/media/dvb/ttpci/av7110_ir.c
@@ -133,7 +133,7 @@ static void av7110_emit_key(unsigned long parm)
133 break; 133 break;
134 134
135 default: 135 default:
136 printk("%s invalid protocol %x\n", __FUNCTION__, ir->protocol); 136 printk("%s invalid protocol %x\n", __func__, ir->protocol);
137 return; 137 return;
138 } 138 }
139 139
@@ -143,7 +143,7 @@ static void av7110_emit_key(unsigned long parm)
143 keycode = ir->key_map[data]; 143 keycode = ir->key_map[data];
144 144
145 dprintk(16, "%s: code %08x -> addr %i data 0x%02x -> keycode %i\n", 145 dprintk(16, "%s: code %08x -> addr %i data 0x%02x -> keycode %i\n",
146 __FUNCTION__, ircom, addr, data, keycode); 146 __func__, ircom, addr, data, keycode);
147 147
148 /* check device address */ 148 /* check device address */
149 if (!(ir->device_mask & (1 << addr))) 149 if (!(ir->device_mask & (1 << addr)))
@@ -151,7 +151,7 @@ static void av7110_emit_key(unsigned long parm)
151 151
152 if (!keycode) { 152 if (!keycode) {
153 printk ("%s: code %08x -> addr %i data 0x%02x -> unknown key!\n", 153 printk ("%s: code %08x -> addr %i data 0x%02x -> unknown key!\n",
154 __FUNCTION__, ircom, addr, data); 154 __func__, ircom, addr, data);
155 return; 155 return;
156 } 156 }
157 157
diff --git a/drivers/media/dvb/ttpci/av7110_v4l.c b/drivers/media/dvb/ttpci/av7110_v4l.c
index e2f066fb7967..b4a0cc5dc935 100644
--- a/drivers/media/dvb/ttpci/av7110_v4l.c
+++ b/drivers/media/dvb/ttpci/av7110_v4l.c
@@ -573,7 +573,7 @@ static int av7110_vbi_reset(struct inode *inode, struct file *file)
573 struct saa7146_dev *dev = fh->dev; 573 struct saa7146_dev *dev = fh->dev;
574 struct av7110 *av7110 = (struct av7110*) dev->ext_priv; 574 struct av7110 *av7110 = (struct av7110*) dev->ext_priv;
575 575
576 dprintk(2, "%s\n", __FUNCTION__); 576 dprintk(2, "%s\n", __func__);
577 av7110->wssMode = 0; 577 av7110->wssMode = 0;
578 av7110->wssData = 0; 578 av7110->wssData = 0;
579 if (FW_VERSION(av7110->arm_app) < 0x2623) 579 if (FW_VERSION(av7110->arm_app) < 0x2623)
@@ -590,7 +590,7 @@ static ssize_t av7110_vbi_write(struct file *file, const char __user *data, size
590 struct v4l2_sliced_vbi_data d; 590 struct v4l2_sliced_vbi_data d;
591 int rc; 591 int rc;
592 592
593 dprintk(2, "%s\n", __FUNCTION__); 593 dprintk(2, "%s\n", __func__);
594 if (FW_VERSION(av7110->arm_app) < 0x2623 || !av7110->wssMode || count != sizeof d) 594 if (FW_VERSION(av7110->arm_app) < 0x2623 || !av7110->wssMode || count != sizeof d)
595 return -EINVAL; 595 return -EINVAL;
596 if (copy_from_user(&d, data, count)) 596 if (copy_from_user(&d, data, count))
diff --git a/drivers/media/dvb/ttpci/budget-ci.c b/drivers/media/dvb/ttpci/budget-ci.c
index 0f476f75e03d..0323515bfd2a 100644
--- a/drivers/media/dvb/ttpci/budget-ci.c
+++ b/drivers/media/dvb/ttpci/budget-ci.c
@@ -1121,7 +1121,7 @@ static void frontend_init(struct budget_ci *budget_ci)
1121 1121
1122 budget_ci->budget.dvb_frontend->ops.dishnetwork_send_legacy_command = NULL; 1122 budget_ci->budget.dvb_frontend->ops.dishnetwork_send_legacy_command = NULL;
1123 if (dvb_attach(lnbp21_attach, budget_ci->budget.dvb_frontend, &budget_ci->budget.i2c_adap, LNBP21_LLC, 0) == NULL) { 1123 if (dvb_attach(lnbp21_attach, budget_ci->budget.dvb_frontend, &budget_ci->budget.i2c_adap, LNBP21_LLC, 0) == NULL) {
1124 printk("%s: No LNBP21 found!\n", __FUNCTION__); 1124 printk("%s: No LNBP21 found!\n", __func__);
1125 dvb_frontend_detach(budget_ci->budget.dvb_frontend); 1125 dvb_frontend_detach(budget_ci->budget.dvb_frontend);
1126 budget_ci->budget.dvb_frontend = NULL; 1126 budget_ci->budget.dvb_frontend = NULL;
1127 } 1127 }
diff --git a/drivers/media/dvb/ttpci/budget-core.c b/drivers/media/dvb/ttpci/budget-core.c
index 0252081f013c..06bbce42fcd7 100644
--- a/drivers/media/dvb/ttpci/budget-core.c
+++ b/drivers/media/dvb/ttpci/budget-core.c
@@ -223,7 +223,7 @@ static void vpeirq(unsigned long data)
223 223
224 if (budget->buffer_warnings && time_after(jiffies, budget->buffer_warning_time)) { 224 if (budget->buffer_warnings && time_after(jiffies, budget->buffer_warning_time)) {
225 printk("%s %s: used %d times >80%% of buffer (%u bytes now)\n", 225 printk("%s %s: used %d times >80%% of buffer (%u bytes now)\n",
226 budget->dev->name, __FUNCTION__, budget->buffer_warnings, count); 226 budget->dev->name, __func__, budget->buffer_warnings, count);
227 budget->buffer_warning_time = jiffies + BUFFER_WARNING_WAIT; 227 budget->buffer_warning_time = jiffies + BUFFER_WARNING_WAIT;
228 budget->buffer_warnings = 0; 228 budget->buffer_warnings = 0;
229 } 229 }
diff --git a/drivers/media/dvb/ttpci/budget.c b/drivers/media/dvb/ttpci/budget.c
index 14b00f57b5de..6cbb52d64244 100644
--- a/drivers/media/dvb/ttpci/budget.c
+++ b/drivers/media/dvb/ttpci/budget.c
@@ -438,7 +438,7 @@ static void frontend_init(struct budget *budget)
438 if (budget->dvb_frontend) { 438 if (budget->dvb_frontend) {
439 budget->dvb_frontend->ops.tuner_ops.set_params = s5h1420_tuner_set_params; 439 budget->dvb_frontend->ops.tuner_ops.set_params = s5h1420_tuner_set_params;
440 if (dvb_attach(lnbp21_attach, budget->dvb_frontend, &budget->i2c_adap, 0, 0) == NULL) { 440 if (dvb_attach(lnbp21_attach, budget->dvb_frontend, &budget->i2c_adap, 0, 0) == NULL) {
441 printk("%s: No LNBP21 found!\n", __FUNCTION__); 441 printk("%s: No LNBP21 found!\n", __func__);
442 goto error_out; 442 goto error_out;
443 } 443 }
444 break; 444 break;
@@ -454,9 +454,9 @@ static void frontend_init(struct budget *budget)
454 budget->dvb_frontend = dvb_attach(tda10086_attach, &tda10086_config, &budget->i2c_adap); 454 budget->dvb_frontend = dvb_attach(tda10086_attach, &tda10086_config, &budget->i2c_adap);
455 if (budget->dvb_frontend) { 455 if (budget->dvb_frontend) {
456 if (dvb_attach(tda826x_attach, budget->dvb_frontend, 0x60, &budget->i2c_adap, 0) == NULL) 456 if (dvb_attach(tda826x_attach, budget->dvb_frontend, 0x60, &budget->i2c_adap, 0) == NULL)
457 printk("%s: No tda826x found!\n", __FUNCTION__); 457 printk("%s: No tda826x found!\n", __func__);
458 if (dvb_attach(lnbp21_attach, budget->dvb_frontend, &budget->i2c_adap, 0, 0) == NULL) { 458 if (dvb_attach(lnbp21_attach, budget->dvb_frontend, &budget->i2c_adap, 0, 0) == NULL) {
459 printk("%s: No LNBP21 found!\n", __FUNCTION__); 459 printk("%s: No LNBP21 found!\n", __func__);
460 goto error_out; 460 goto error_out;
461 } 461 }
462 break; 462 break;
diff --git a/drivers/media/dvb/ttpci/budget.h b/drivers/media/dvb/ttpci/budget.h
index d764ffa728b0..dd450b739bff 100644
--- a/drivers/media/dvb/ttpci/budget.h
+++ b/drivers/media/dvb/ttpci/budget.h
@@ -1,3 +1,4 @@
1
1#ifndef __BUDGET_DVB__ 2#ifndef __BUDGET_DVB__
2#define __BUDGET_DVB__ 3#define __BUDGET_DVB__
3 4
@@ -21,7 +22,7 @@ extern int budget_debug;
21#endif 22#endif
22 23
23#define dprintk(level,args...) \ 24#define dprintk(level,args...) \
24 do { if ((budget_debug & level)) { printk("%s: %s(): ", KBUILD_MODNAME, __FUNCTION__); printk(args); } } while (0) 25 do { if ((budget_debug & level)) { printk("%s: %s(): ", KBUILD_MODNAME, __func__); printk(args); } } while (0)
25 26
26struct budget_info { 27struct budget_info {
27 char *name; 28 char *name;
diff --git a/drivers/media/dvb/ttpci/ttpci-eeprom.c b/drivers/media/dvb/ttpci/ttpci-eeprom.c
index 1f31e91195b0..7dd54b3026a2 100644
--- a/drivers/media/dvb/ttpci/ttpci-eeprom.c
+++ b/drivers/media/dvb/ttpci/ttpci-eeprom.c
@@ -95,7 +95,7 @@ static int ttpci_eeprom_read_encodedMAC(struct i2c_adapter *adapter, u8 * encode
95 { .addr = 0x50, .flags = I2C_M_RD, .buf = encodedMAC, .len = 20 } 95 { .addr = 0x50, .flags = I2C_M_RD, .buf = encodedMAC, .len = 20 }
96 }; 96 };
97 97
98 /* dprintk("%s\n", __FUNCTION__); */ 98 /* dprintk("%s\n", __func__); */
99 99
100 ret = i2c_transfer(adapter, msg, 2); 100 ret = i2c_transfer(adapter, msg, 2);
101 101