Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 22b4e64f0a119e94090ef45285a5c311f1f6855f

Authored by Harvey Harrison
Committed by Mauro Carvalho Chehab
1 parent 94205c7a48
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

V4L/DVB (7520): media/video/cx23885 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>

Showing 5 changed files with 90 additions and 90 deletions Side-by-side Diff

drivers/media/video/cx23885/cx23885-cards.c
Diff comments   View file @ 22b4e64
... ... @@ -264,7 +264,7 @@
264 264 }
265 265 else {
266 266 printk(KERN_ERR
267   - "%s(): Unknow command.\n", __FUNCTION__);
  267 + "%s(): Unknow command.\n", __func__);
268 268 return -EINVAL;
269 269 }
270 270 break;
drivers/media/video/cx23885/cx23885-core.c
Diff comments   View file @ 22b4e64
... ... @@ -260,7 +260,7 @@
260 260 }
261 261 if (bc != 1)
262 262 printk("%s: %d buffers handled (should be 1)\n",
263   - __FUNCTION__, bc);
  263 + __func__, bc);
264 264 }
265 265  
266 266 int cx23885_sram_channel_setup(struct cx23885_dev *dev,
... ... @@ -272,7 +272,7 @@
272 272  
273 273 if (ch->cmds_start == 0)
274 274 {
275   - dprintk(1, "%s() Erasing channel [%s]\n", __FUNCTION__,
  275 + dprintk(1, "%s() Erasing channel [%s]\n", __func__,
276 276 ch->name);
277 277 cx_write(ch->ptr1_reg, 0);
278 278 cx_write(ch->ptr2_reg, 0);
... ... @@ -280,7 +280,7 @@
280 280 cx_write(ch->cnt1_reg, 0);
281 281 return 0;
282 282 } else {
283   - dprintk(1, "%s() Configuring channel [%s]\n", __FUNCTION__,
  283 + dprintk(1, "%s() Configuring channel [%s]\n", __func__,
284 284 ch->name);
285 285 }
286 286  
... ... @@ -297,7 +297,7 @@
297 297  
298 298 /* write CDT */
299 299 for (i = 0; i < lines; i++) {
300   - dprintk(2, "%s() 0x%08x <- 0x%08x\n", __FUNCTION__, cdt + 16*i,
  300 + dprintk(2, "%s() 0x%08x <- 0x%08x\n", __func__, cdt + 16*i,
301 301 ch->fifo_start + bpl*i);
302 302 cx_write(cdt + 16*i, ch->fifo_start + bpl*i);
303 303 cx_write(cdt + 16*i + 4, 0);
... ... @@ -449,7 +449,7 @@
449 449  
450 450 static void cx23885_reset(struct cx23885_dev *dev)
451 451 {
452   - dprintk(1, "%s()\n", __FUNCTION__);
  452 + dprintk(1, "%s()\n", __func__);
453 453  
454 454 cx23885_shutdown(dev);
455 455  
... ... @@ -482,7 +482,7 @@
482 482  
483 483 static int cx23885_pci_quirks(struct cx23885_dev *dev)
484 484 {
485   - dprintk(1, "%s()\n", __FUNCTION__);
  485 + dprintk(1, "%s()\n", __func__);
486 486  
487 487 /* The cx23885 bridge has a weird bug which causes NMI to be asserted
488 488 * when DMA begins if RDR_TLCTL0 bit4 is not cleared. It does not
... ... @@ -513,7 +513,7 @@
513 513  
514 514 static int cx23885_init_tsport(struct cx23885_dev *dev, struct cx23885_tsport *port, int portno)
515 515 {
516   - dprintk(1, "%s(portno=%d)\n", __FUNCTION__, portno);
  516 + dprintk(1, "%s(portno=%d)\n", __func__, portno);
517 517  
518 518 /* Transport bus init dma queue - Common settings */
519 519 port->dma_ctl_val = 0x11; /* Enable RISC controller and Fifo */
520 520  
521 521  
... ... @@ -604,14 +604,14 @@
604 604 break;
605 605 default:
606 606 printk(KERN_ERR "%s() New hardware revision found 0x%x\n",
607   - __FUNCTION__, dev->hwrevision);
  607 + __func__, dev->hwrevision);
608 608 }
609 609 if (dev->hwrevision)
610 610 printk(KERN_INFO "%s() Hardware revision = 0x%02x\n",
611   - __FUNCTION__, dev->hwrevision);
  611 + __func__, dev->hwrevision);
612 612 else
613 613 printk(KERN_ERR "%s() Hardware revision unknown 0x%x\n",
614   - __FUNCTION__, dev->hwrevision);
  614 + __func__, dev->hwrevision);
615 615 }
616 616  
617 617 static int cx23885_dev_setup(struct cx23885_dev *dev)
... ... @@ -644,7 +644,7 @@
644 644 BUG();
645 645  
646 646 dprintk(1, "%s() Memory configured for PCIe bridge type %d\n",
647   - __FUNCTION__, dev->bridge);
  647 + __func__, dev->bridge);
648 648  
649 649 /* board config */
650 650 dev->board = UNSET;
651 651  
... ... @@ -734,9 +734,9 @@
734 734 dev->radio_addr = cx23885_boards[dev->board].radio_addr;
735 735  
736 736 dprintk(1, "%s() tuner_type = 0x%x tuner_addr = 0x%x\n",
737   - __FUNCTION__, dev->tuner_type, dev->tuner_addr);
  737 + __func__, dev->tuner_type, dev->tuner_addr);
738 738 dprintk(1, "%s() radio_type = 0x%x radio_addr = 0x%x\n",
739   - __FUNCTION__, dev->radio_type, dev->radio_addr);
  739 + __func__, dev->radio_type, dev->radio_addr);
740 740  
741 741 /* init hardware */
742 742 cx23885_reset(dev);
743 743  
744 744  
... ... @@ -751,21 +751,21 @@
751 751 if (cx23885_boards[dev->board].porta == CX23885_ANALOG_VIDEO) {
752 752 if (cx23885_video_register(dev) < 0) {
753 753 printk(KERN_ERR "%s() Failed to register analog "
754   - "video adapters on VID_A\n", __FUNCTION__);
  754 + "video adapters on VID_A\n", __func__);
755 755 }
756 756 }
757 757  
758 758 if (cx23885_boards[dev->board].portb == CX23885_MPEG_DVB) {
759 759 if (cx23885_dvb_register(&dev->ts1) < 0) {
760 760 printk(KERN_ERR "%s() Failed to register dvb adapters on VID_B\n",
761   - __FUNCTION__);
  761 + __func__);
762 762 }
763 763 }
764 764  
765 765 if (cx23885_boards[dev->board].portc == CX23885_MPEG_DVB) {
766 766 if (cx23885_dvb_register(&dev->ts2) < 0) {
767 767 printk(KERN_ERR "%s() Failed to register dvb adapters on VID_C\n",
768   - __FUNCTION__);
  768 + __func__);
769 769 }
770 770 }
771 771  
772 772  
773 773  
774 774  
775 775  
776 776  
777 777  
778 778  
779 779  
780 780  
781 781  
782 782  
783 783  
784 784  
785 785  
786 786  
787 787  
788 788  
789 789  
790 790  
791 791  
792 792  
... ... @@ -960,50 +960,50 @@
960 960 {
961 961 struct cx23885_dev *dev = port->dev;
962 962  
963   - dprintk(1, "%s() Register Dump\n", __FUNCTION__);
964   - dprintk(1, "%s() DEV_CNTRL2 0x%08X\n", __FUNCTION__,
  963 + dprintk(1, "%s() Register Dump\n", __func__);
  964 + dprintk(1, "%s() DEV_CNTRL2 0x%08X\n", __func__,
965 965 cx_read(DEV_CNTRL2));
966   - dprintk(1, "%s() PCI_INT_MSK 0x%08X\n", __FUNCTION__,
  966 + dprintk(1, "%s() PCI_INT_MSK 0x%08X\n", __func__,
967 967 cx_read(PCI_INT_MSK));
968   - dprintk(1, "%s() AUD_INT_INT_MSK 0x%08X\n", __FUNCTION__,
  968 + dprintk(1, "%s() AUD_INT_INT_MSK 0x%08X\n", __func__,
969 969 cx_read(AUDIO_INT_INT_MSK));
970   - dprintk(1, "%s() AUD_INT_DMA_CTL 0x%08X\n", __FUNCTION__,
  970 + dprintk(1, "%s() AUD_INT_DMA_CTL 0x%08X\n", __func__,
971 971 cx_read(AUD_INT_DMA_CTL));
972   - dprintk(1, "%s() AUD_EXT_INT_MSK 0x%08X\n", __FUNCTION__,
  972 + dprintk(1, "%s() AUD_EXT_INT_MSK 0x%08X\n", __func__,
973 973 cx_read(AUDIO_EXT_INT_MSK));
974   - dprintk(1, "%s() AUD_EXT_DMA_CTL 0x%08X\n", __FUNCTION__,
  974 + dprintk(1, "%s() AUD_EXT_DMA_CTL 0x%08X\n", __func__,
975 975 cx_read(AUD_EXT_DMA_CTL));
976   - dprintk(1, "%s() PAD_CTRL 0x%08X\n", __FUNCTION__,
  976 + dprintk(1, "%s() PAD_CTRL 0x%08X\n", __func__,
977 977 cx_read(PAD_CTRL));
978   - dprintk(1, "%s() ALT_PIN_OUT_SEL 0x%08X\n", __FUNCTION__,
  978 + dprintk(1, "%s() ALT_PIN_OUT_SEL 0x%08X\n", __func__,
979 979 cx_read(ALT_PIN_OUT_SEL));
980   - dprintk(1, "%s() GPIO2 0x%08X\n", __FUNCTION__,
  980 + dprintk(1, "%s() GPIO2 0x%08X\n", __func__,
981 981 cx_read(GPIO2));
982   - dprintk(1, "%s() gpcnt(0x%08X) 0x%08X\n", __FUNCTION__,
  982 + dprintk(1, "%s() gpcnt(0x%08X) 0x%08X\n", __func__,
983 983 port->reg_gpcnt, cx_read(port->reg_gpcnt));
984   - dprintk(1, "%s() gpcnt_ctl(0x%08X) 0x%08x\n", __FUNCTION__,
  984 + dprintk(1, "%s() gpcnt_ctl(0x%08X) 0x%08x\n", __func__,
985 985 port->reg_gpcnt_ctl, cx_read(port->reg_gpcnt_ctl));
986   - dprintk(1, "%s() dma_ctl(0x%08X) 0x%08x\n", __FUNCTION__,
  986 + dprintk(1, "%s() dma_ctl(0x%08X) 0x%08x\n", __func__,
987 987 port->reg_dma_ctl, cx_read(port->reg_dma_ctl));
988   - dprintk(1, "%s() src_sel(0x%08X) 0x%08x\n", __FUNCTION__,
  988 + dprintk(1, "%s() src_sel(0x%08X) 0x%08x\n", __func__,
989 989 port->reg_src_sel, cx_read(port->reg_src_sel));
990   - dprintk(1, "%s() lngth(0x%08X) 0x%08x\n", __FUNCTION__,
  990 + dprintk(1, "%s() lngth(0x%08X) 0x%08x\n", __func__,
991 991 port->reg_lngth, cx_read(port->reg_lngth));
992   - dprintk(1, "%s() hw_sop_ctrl(0x%08X) 0x%08x\n", __FUNCTION__,
  992 + dprintk(1, "%s() hw_sop_ctrl(0x%08X) 0x%08x\n", __func__,
993 993 port->reg_hw_sop_ctrl, cx_read(port->reg_hw_sop_ctrl));
994   - dprintk(1, "%s() gen_ctrl(0x%08X) 0x%08x\n", __FUNCTION__,
  994 + dprintk(1, "%s() gen_ctrl(0x%08X) 0x%08x\n", __func__,
995 995 port->reg_gen_ctrl, cx_read(port->reg_gen_ctrl));
996   - dprintk(1, "%s() bd_pkt_status(0x%08X) 0x%08x\n", __FUNCTION__,
  996 + dprintk(1, "%s() bd_pkt_status(0x%08X) 0x%08x\n", __func__,
997 997 port->reg_bd_pkt_status, cx_read(port->reg_bd_pkt_status));
998   - dprintk(1, "%s() sop_status(0x%08X) 0x%08x\n", __FUNCTION__,
  998 + dprintk(1, "%s() sop_status(0x%08X) 0x%08x\n", __func__,
999 999 port->reg_sop_status, cx_read(port->reg_sop_status));
1000   - dprintk(1, "%s() fifo_ovfl_stat(0x%08X) 0x%08x\n", __FUNCTION__,
  1000 + dprintk(1, "%s() fifo_ovfl_stat(0x%08X) 0x%08x\n", __func__,
1001 1001 port->reg_fifo_ovfl_stat, cx_read(port->reg_fifo_ovfl_stat));
1002   - dprintk(1, "%s() vld_misc(0x%08X) 0x%08x\n", __FUNCTION__,
  1002 + dprintk(1, "%s() vld_misc(0x%08X) 0x%08x\n", __func__,
1003 1003 port->reg_vld_misc, cx_read(port->reg_vld_misc));
1004   - dprintk(1, "%s() ts_clk_en(0x%08X) 0x%08x\n", __FUNCTION__,
  1004 + dprintk(1, "%s() ts_clk_en(0x%08X) 0x%08x\n", __func__,
1005 1005 port->reg_ts_clk_en, cx_read(port->reg_ts_clk_en));
1006   - dprintk(1, "%s() ts_int_msk(0x%08X) 0x%08x\n", __FUNCTION__,
  1006 + dprintk(1, "%s() ts_int_msk(0x%08X) 0x%08x\n", __func__,
1007 1007 port->reg_ts_int_msk, cx_read(port->reg_ts_int_msk));
1008 1008 }
1009 1009  
... ... @@ -1013,7 +1013,7 @@
1013 1013 {
1014 1014 struct cx23885_dev *dev = port->dev;
1015 1015  
1016   - dprintk(1, "%s() w: %d, h: %d, f: %d\n", __FUNCTION__,
  1016 + dprintk(1, "%s() w: %d, h: %d, f: %d\n", __func__,
1017 1017 buf->vb.width, buf->vb.height, buf->vb.field);
1018 1018  
1019 1019 /* setup fifo + format */
... ... @@ -1031,7 +1031,7 @@
1031 1031 if ( (!(cx23885_boards[dev->board].portb & CX23885_MPEG_DVB)) &&
1032 1032 (!(cx23885_boards[dev->board].portc & CX23885_MPEG_DVB)) ) {
1033 1033 printk( "%s() Failed. Unsupported value in .portb/c (0x%08x)/(0x%08x)\n",
1034   - __FUNCTION__,
  1034 + __func__,
1035 1035 cx23885_boards[dev->board].portb,
1036 1036 cx23885_boards[dev->board].portc );
1037 1037 return -EINVAL;
... ... @@ -1058,7 +1058,7 @@
1058 1058 case CX23885_BRIDGE_885:
1059 1059 case CX23885_BRIDGE_887:
1060 1060 /* enable irqs */
1061   - dprintk(1, "%s() enabling TS int's and DMA\n", __FUNCTION__ );
  1061 + dprintk(1, "%s() enabling TS int's and DMA\n", __func__ );
1062 1062 cx_set(port->reg_ts_int_msk, port->ts_int_msk_val);
1063 1063 cx_set(port->reg_dma_ctl, port->dma_ctl_val);
1064 1064 cx_set(PCI_INT_MSK, dev->pci_irqmask | port->pci_irqmask);
... ... @@ -1078,7 +1078,7 @@
1078 1078 static int cx23885_stop_dma(struct cx23885_tsport *port)
1079 1079 {
1080 1080 struct cx23885_dev *dev = port->dev;
1081   - dprintk(1, "%s()\n", __FUNCTION__);
  1081 + dprintk(1, "%s()\n", __func__);
1082 1082  
1083 1083 /* Stop interrupts and DMA */
1084 1084 cx_clear(port->reg_ts_int_msk, port->ts_int_msk_val);
1085 1085  
... ... @@ -1093,13 +1093,13 @@
1093 1093 struct cx23885_dev *dev = port->dev;
1094 1094 struct cx23885_buffer *buf;
1095 1095  
1096   - dprintk(5, "%s()\n", __FUNCTION__);
  1096 + dprintk(5, "%s()\n", __func__);
1097 1097 if (list_empty(&q->active))
1098 1098 {
1099 1099 struct cx23885_buffer *prev;
1100 1100 prev = NULL;
1101 1101  
1102   - dprintk(5, "%s() queue is empty\n", __FUNCTION__);
  1102 + dprintk(5, "%s() queue is empty\n", __func__);
1103 1103  
1104 1104 for (;;) {
1105 1105 if (list_empty(&q->queued))
... ... @@ -1154,7 +1154,7 @@
1154 1154 int size = port->ts_packet_size * port->ts_packet_count;
1155 1155 int rc;
1156 1156  
1157   - dprintk(1, "%s: %p\n", __FUNCTION__, buf);
  1157 + dprintk(1, "%s: %p\n", __func__, buf);
1158 1158 if (0 != buf->vb.baddr && buf->vb.bsize < size)
1159 1159 return -EINVAL;
1160 1160  
... ... @@ -1197,7 +1197,7 @@
1197 1197 buf->count = cx88q->count++;
1198 1198 mod_timer(&cx88q->timeout, jiffies + BUFFER_TIMEOUT);
1199 1199 dprintk(1, "[%p/%d] %s - first active\n",
1200   - buf, buf->vb.i, __FUNCTION__);
  1200 + buf, buf->vb.i, __func__);
1201 1201 } else {
1202 1202 dprintk( 1, "queue is not empty - append to active\n" );
1203 1203 prev = list_entry(cx88q->active.prev, struct cx23885_buffer,
... ... @@ -1208,7 +1208,7 @@
1208 1208 prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
1209 1209 prev->risc.jmp[2] = cpu_to_le32(0); /* 64 bit bits 63-32 */
1210 1210 dprintk( 1, "[%p/%d] %s - append to active\n",
1211   - buf, buf->vb.i, __FUNCTION__);
  1211 + buf, buf->vb.i, __func__);
1212 1212 }
1213 1213 }
1214 1214  
... ... @@ -1245,7 +1245,7 @@
1245 1245 struct cx23885_tsport *port = (struct cx23885_tsport *)data;
1246 1246 struct cx23885_dev *dev = port->dev;
1247 1247  
1248   - dprintk(1, "%s()\n",__FUNCTION__);
  1248 + dprintk(1, "%s()\n",__func__);
1249 1249  
1250 1250 if (debug > 5)
1251 1251 cx23885_sram_channel_dump(dev, &dev->sram_channels[ port->sram_chno ]);
drivers/media/video/cx23885/cx23885-dvb.c
Diff comments   View file @ 22b4e64
... ... @@ -185,7 +185,7 @@
185 185 case XC2028_TUNER_RESET:
186 186 /* Send the tuner in then out of reset */
187 187 /* GPIO-2 xc3028 tuner */
188   - dprintk(1, "%s: XC2028_TUNER_RESET %d\n", __FUNCTION__, arg);
  188 + dprintk(1, "%s: XC2028_TUNER_RESET %d\n", __func__, arg);
189 189  
190 190 cx_set(GP0_IO, 0x00040000);
191 191 cx_clear(GP0_IO, 0x00000004);
192 192  
... ... @@ -195,10 +195,10 @@
195 195 msleep(5);
196 196 break;
197 197 case XC2028_RESET_CLK:
198   - dprintk(1, "%s: XC2028_RESET_CLK %d\n", __FUNCTION__, arg);
  198 + dprintk(1, "%s: XC2028_RESET_CLK %d\n", __func__, arg);
199 199 break;
200 200 default:
201   - dprintk(1, "%s: unknown command %d, arg %d\n", __FUNCTION__,
  201 + dprintk(1, "%s: unknown command %d, arg %d\n", __func__,
202 202 command, arg);
203 203 return -EINVAL;
204 204 }
... ... @@ -341,7 +341,7 @@
341 341 struct cx23885_dev *dev = port->dev;
342 342 int err;
343 343  
344   - dprintk(1, "%s\n", __FUNCTION__);
  344 + dprintk(1, "%s\n", __func__);
345 345 dprintk(1, " ->being probed by Card=%d Name=%s, PCI %02x:%02x\n",
346 346 dev->board,
347 347 dev->name,
... ... @@ -357,7 +357,7 @@
357 357 sizeof(struct cx23885_buffer), port);
358 358 err = dvb_register(port);
359 359 if (err != 0)
360   - printk("%s() dvb_register failed err = %d\n", __FUNCTION__, err);
  360 + printk("%s() dvb_register failed err = %d\n", __func__, err);
361 361  
362 362 return err;
363 363 }
drivers/media/video/cx23885/cx23885-i2c.c
Diff comments   View file @ 22b4e64
... ... @@ -87,10 +87,10 @@
87 87 int retval, cnt;
88 88  
89 89 if (joined_rlen)
90   - dprintk(1, "%s(msg->wlen=%d, nextmsg->rlen=%d)\n", __FUNCTION__,
  90 + dprintk(1, "%s(msg->wlen=%d, nextmsg->rlen=%d)\n", __func__,
91 91 msg->len, joined_rlen);
92 92 else
93   - dprintk(1, "%s(msg->len=%d)\n", __FUNCTION__, msg->len);
  93 + dprintk(1, "%s(msg->len=%d)\n", __func__, msg->len);
94 94  
95 95 /* Deal with i2c probe functions with zero payload */
96 96 if (msg->len == 0) {
... ... @@ -101,7 +101,7 @@
101 101 if (!i2c_slave_did_ack(i2c_adap))
102 102 return -EIO;
103 103  
104   - dprintk(1, "%s() returns 0\n", __FUNCTION__);
  104 + dprintk(1, "%s() returns 0\n", __func__);
105 105 return 0;
106 106 }
107 107  
... ... @@ -176,7 +176,7 @@
176 176  
177 177  
178 178 if (i2c_debug && !joined)
179   - dprintk(1, "%s(msg->len=%d)\n", __FUNCTION__, msg->len);
  179 + dprintk(1, "%s(msg->len=%d)\n", __func__, msg->len);
180 180  
181 181 /* Deal with i2c probe functions with zero payload */
182 182 if (msg->len == 0) {
... ... @@ -188,7 +188,7 @@
188 188 return -EIO;
189 189  
190 190  
191   - dprintk(1, "%s() returns 0\n", __FUNCTION__);
  191 + dprintk(1, "%s() returns 0\n", __func__);
192 192 return 0;
193 193 }
194 194  
195 195  
... ... @@ -238,11 +238,11 @@
238 238 struct cx23885_dev *dev = bus->dev;
239 239 int i, retval = 0;
240 240  
241   - dprintk(1, "%s(num = %d)\n", __FUNCTION__, num);
  241 + dprintk(1, "%s(num = %d)\n", __func__, num);
242 242  
243 243 for (i = 0 ; i < num; i++) {
244 244 dprintk(1, "%s(num = %d) addr = 0x%02x len = 0x%x\n",
245   - __FUNCTION__, num, msgs[i].addr, msgs[i].len);
  245 + __func__, num, msgs[i].addr, msgs[i].len);
246 246 if (msgs[i].flags & I2C_M_RD) {
247 247 /* read */
248 248 retval = i2c_readbytes(i2c_adap, &msgs[i], 0);
... ... @@ -383,7 +383,7 @@
383 383 {
384 384 struct cx23885_dev *dev = bus->dev;
385 385  
386   - dprintk(1, "%s(bus = %d)\n", __FUNCTION__, bus->nr);
  386 + dprintk(1, "%s(bus = %d)\n", __func__, bus->nr);
387 387  
388 388 memcpy(&bus->i2c_adap, &cx23885_i2c_adap_template,
389 389 sizeof(bus->i2c_adap));
drivers/media/video/cx23885/cx23885-video.c
Diff comments   View file @ 22b4e64
... ... @@ -141,7 +141,7 @@
141 141 if (formats[i].fourcc == fourcc)
142 142 return formats+i;
143 143  
144   - printk(KERN_ERR "%s(0x%08x) NOT FOUND\n", __FUNCTION__, fourcc);
  144 + printk(KERN_ERR "%s(0x%08x) NOT FOUND\n", __func__, fourcc);
145 145 return NULL;
146 146 }
147 147  
148 148  
... ... @@ -292,13 +292,13 @@
292 292 }
293 293 if (bc != 1)
294 294 printk(KERN_ERR "%s: %d buffers handled (should be 1)\n",
295   - __FUNCTION__, bc);
  295 + __func__, bc);
296 296 }
297 297  
298 298 int cx23885_set_tvnorm(struct cx23885_dev *dev, v4l2_std_id norm)
299 299 {
300 300 dprintk(1, "%s(norm = 0x%08x) name: [%s]\n",
301   - __FUNCTION__,
  301 + __func__,
302 302 (unsigned int)norm,
303 303 v4l2_norm_to_name(norm));
304 304  
... ... @@ -319,7 +319,7 @@
319 319 char *type)
320 320 {
321 321 struct video_device *vfd;
322   - dprintk(1, "%s()\n", __FUNCTION__);
  322 + dprintk(1, "%s()\n", __func__);
323 323  
324 324 vfd = video_device_alloc();
325 325 if (NULL == vfd)
... ... @@ -358,7 +358,7 @@
358 358 static int res_get(struct cx23885_dev *dev, struct cx23885_fh *fh,
359 359 unsigned int bit)
360 360 {
361   - dprintk(1, "%s()\n", __FUNCTION__);
  361 + dprintk(1, "%s()\n", __func__);
362 362 if (fh->resources & bit)
363 363 /* have it already allocated */
364 364 return 1;
... ... @@ -392,7 +392,7 @@
392 392 unsigned int bits)
393 393 {
394 394 BUG_ON((fh->resources & bits) != bits);
395   - dprintk(1, "%s()\n", __FUNCTION__);
  395 + dprintk(1, "%s()\n", __func__);
396 396  
397 397 mutex_lock(&dev->lock);
398 398 fh->resources &= ~bits;
... ... @@ -407,7 +407,7 @@
407 407 memset(&route, 0, sizeof(route));
408 408  
409 409 dprintk(1, "%s() video_mux: %d [vmux=%d, gpio=0x%x,0x%x,0x%x,0x%x]\n",
410   - __FUNCTION__,
  410 + __func__,
411 411 input, INPUT(input)->vmux,
412 412 INPUT(input)->gpio0, INPUT(input)->gpio1,
413 413 INPUT(input)->gpio2, INPUT(input)->gpio3);
... ... @@ -427,7 +427,7 @@
427 427 int cx23885_set_scale(struct cx23885_dev *dev, unsigned int width,
428 428 unsigned int height, enum v4l2_field field)
429 429 {
430   - dprintk(1, "%s()\n", __FUNCTION__);
  430 + dprintk(1, "%s()\n", __func__);
431 431 return 0;
432 432 }
433 433  
... ... @@ -435,7 +435,7 @@
435 435 struct cx23885_dmaqueue *q,
436 436 struct cx23885_buffer *buf)
437 437 {
438   - dprintk(1, "%s()\n", __FUNCTION__);
  438 + dprintk(1, "%s()\n", __func__);
439 439  
440 440 /* setup fifo + format */
441 441 cx23885_sram_channel_setup(dev, &dev->sram_channels[SRAM_CH01],
... ... @@ -463,7 +463,7 @@
463 463 {
464 464 struct cx23885_buffer *buf, *prev;
465 465 struct list_head *item;
466   - dprintk(1, "%s()\n", __FUNCTION__);
  466 + dprintk(1, "%s()\n", __func__);
467 467  
468 468 if (!list_empty(&q->active)) {
469 469 buf = list_entry(q->active.next, struct cx23885_buffer,
470 470  
... ... @@ -579,13 +579,13 @@
579 579 if (dev->tvnorm & V4L2_STD_NTSC) {
580 580 /* cx25840 transmits NTSC bottom field first */
581 581 dprintk(1, "%s() Creating NTSC risc\n",
582   - __FUNCTION__);
  582 + __func__);
583 583 line0_offset = buf->bpl;
584 584 line1_offset = 0;
585 585 } else {
586 586 /* All other formats are top field first */
587 587 dprintk(1, "%s() Creating PAL/SECAM risc\n",
588   - __FUNCTION__);
  588 + __func__);
589 589 line0_offset = 0;
590 590 line1_offset = buf->bpl;
591 591 }
... ... @@ -885,7 +885,7 @@
885 885  
886 886 int cx23885_get_control(struct cx23885_dev *dev, struct v4l2_control *ctl)
887 887 {
888   - dprintk(1, "%s() calling cx25840(VIDIOC_G_CTRL)\n", __FUNCTION__);
  888 + dprintk(1, "%s() calling cx25840(VIDIOC_G_CTRL)\n", __func__);
889 889 cx23885_call_i2c_clients(&dev->i2c_bus[2], VIDIOC_G_CTRL, ctl);
890 890 return 0;
891 891 }
... ... @@ -894,7 +894,7 @@
894 894 int cx23885_set_control(struct cx23885_dev *dev, struct v4l2_control *ctl)
895 895 {
896 896 dprintk(1, "%s() calling cx25840(VIDIOC_S_CTRL)"
897   - " (disabled - no action)\n", __FUNCTION__);
  897 + " (disabled - no action)\n", __func__);
898 898 return 0;
899 899 }
900 900 EXPORT_SYMBOL(cx23885_set_control);
... ... @@ -990,7 +990,7 @@
990 990 struct cx23885_dev *dev = ((struct cx23885_fh *)priv)->dev;
991 991 int err;
992 992  
993   - dprintk(2, "%s()\n", __FUNCTION__);
  993 + dprintk(2, "%s()\n", __func__);
994 994 err = vidioc_try_fmt_cap(file, priv, f);
995 995  
996 996 if (0 != err)
... ... @@ -999,7 +999,7 @@
999 999 fh->width = f->fmt.pix.width;
1000 1000 fh->height = f->fmt.pix.height;
1001 1001 fh->vidq.field = f->fmt.pix.field;
1002   - dprintk(2, "%s() width=%d height=%d field=%d\n", __FUNCTION__,
  1002 + dprintk(2, "%s() width=%d height=%d field=%d\n", __func__,
1003 1003 fh->width, fh->height, fh->vidq.field);
1004 1004 cx23885_call_i2c_clients(&dev->i2c_bus[2], VIDIOC_S_FMT, f);
1005 1005 return 0;
... ... @@ -1101,7 +1101,7 @@
1101 1101 {
1102 1102 struct cx23885_fh *fh = priv;
1103 1103 struct cx23885_dev *dev = fh->dev;
1104   - dprintk(1, "%s()\n", __FUNCTION__);
  1104 + dprintk(1, "%s()\n", __func__);
1105 1105  
1106 1106 if (unlikely(fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE))
1107 1107 return -EINVAL;
... ... @@ -1118,7 +1118,7 @@
1118 1118 struct cx23885_fh *fh = priv;
1119 1119 struct cx23885_dev *dev = fh->dev;
1120 1120 int err, res;
1121   - dprintk(1, "%s()\n", __FUNCTION__);
  1121 + dprintk(1, "%s()\n", __func__);
1122 1122  
1123 1123 if (fh->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
1124 1124 return -EINVAL;
... ... @@ -1136,7 +1136,7 @@
1136 1136 static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id *tvnorms)
1137 1137 {
1138 1138 struct cx23885_dev *dev = ((struct cx23885_fh *)priv)->dev;
1139   - dprintk(1, "%s()\n", __FUNCTION__);
  1139 + dprintk(1, "%s()\n", __func__);
1140 1140  
1141 1141 mutex_lock(&dev->lock);
1142 1142 cx23885_set_tvnorm(dev, *tvnorms);
... ... @@ -1159,7 +1159,7 @@
1159 1159 [CX23885_VMUX_DEBUG] = "for debug only",
1160 1160 };
1161 1161 unsigned int n;
1162   - dprintk(1, "%s()\n", __FUNCTION__);
  1162 + dprintk(1, "%s()\n", __func__);
1163 1163  
1164 1164 n = i->index;
1165 1165 if (n >= 4)
... ... @@ -1184,7 +1184,7 @@
1184 1184 struct v4l2_input *i)
1185 1185 {
1186 1186 struct cx23885_dev *dev = ((struct cx23885_fh *)priv)->dev;
1187   - dprintk(1, "%s()\n", __FUNCTION__);
  1187 + dprintk(1, "%s()\n", __func__);
1188 1188 return cx23885_enum_input(dev, i);
1189 1189 }
1190 1190  
... ... @@ -1193,7 +1193,7 @@
1193 1193 struct cx23885_dev *dev = ((struct cx23885_fh *)priv)->dev;
1194 1194  
1195 1195 *i = dev->input;
1196   - dprintk(1, "%s() returns %d\n", __FUNCTION__, *i);
  1196 + dprintk(1, "%s() returns %d\n", __func__, *i);
1197 1197 return 0;
1198 1198 }
1199 1199  
1200 1200  
... ... @@ -1201,10 +1201,10 @@
1201 1201 {
1202 1202 struct cx23885_dev *dev = ((struct cx23885_fh *)priv)->dev;
1203 1203  
1204   - dprintk(1, "%s(%d)\n", __FUNCTION__, i);
  1204 + dprintk(1, "%s(%d)\n", __func__, i);
1205 1205  
1206 1206 if (i >= 4) {
1207   - dprintk(1, "%s() -EINVAL\n", __FUNCTION__);
  1207 + dprintk(1, "%s() -EINVAL\n", __func__);
1208 1208 return -EINVAL;
1209 1209 }
1210 1210  
... ... @@ -1389,7 +1389,7 @@
1389 1389 return handled;
1390 1390 cx_write(VID_A_INT_STAT, status);
1391 1391  
1392   - dprintk(2, "%s() status = 0x%08x\n", __FUNCTION__, status);
  1392 + dprintk(2, "%s() status = 0x%08x\n", __func__, status);
1393 1393 /* risc op code error */
1394 1394 if (status & (1 << 16)) {
1395 1395 printk(KERN_WARNING "%s/0: video risc op code error\n",
... ... @@ -1487,7 +1487,7 @@
1487 1487  
1488 1488 void cx23885_video_unregister(struct cx23885_dev *dev)
1489 1489 {
1490   - dprintk(1, "%s()\n", __FUNCTION__);
  1490 + dprintk(1, "%s()\n", __func__);
1491 1491 cx_clear(PCI_INT_MSK, 1);
1492 1492  
1493 1493 if (dev->video_dev) {
... ... @@ -1505,7 +1505,7 @@
1505 1505 {
1506 1506 int err;
1507 1507  
1508   - dprintk(1, "%s()\n", __FUNCTION__);
  1508 + dprintk(1, "%s()\n", __func__);
1509 1509 spin_lock_init(&dev->slock);
1510 1510  
1511 1511 /* Initialize VBI template */