aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/ttpci/av7110.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
commit3ca7fc84e37c5cf446fe4137f885f74e71373d7f (patch)
tree236bae57740ccd8308c740fc635a43c84b136b10 /drivers/media/dvb/ttpci/av7110.c
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/av7110.c')
-rw-r--r--drivers/media/dvb/ttpci/av7110.c12
1 files changed, 6 insertions, 6 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",