aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb
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
commitfb9393b519fb27714d14625bc3042b669933e81a (patch)
treeae51fab5e721014c873771bd8f407da4b13f8c9e /drivers/media/dvb
parent3ca7fc84e37c5cf446fe4137f885f74e71373d7f (diff)
V4L/DVB (7516): media/dvb/ttusb-budget 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/media/dvb')
-rw-r--r--drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c44
1 files changed, 22 insertions, 22 deletions
diff --git a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
index 1b3b6c1589f7..317eccbe5c66 100644
--- a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
+++ b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
@@ -153,12 +153,12 @@ static int ttusb_cmd(struct ttusb *ttusb,
153 (u8 *) data, len, &actual_len, 1000); 153 (u8 *) data, len, &actual_len, 1000);
154 if (err != 0) { 154 if (err != 0) {
155 dprintk("%s: usb_bulk_msg(send) failed, err == %i!\n", 155 dprintk("%s: usb_bulk_msg(send) failed, err == %i!\n",
156 __FUNCTION__, err); 156 __func__, err);
157 mutex_unlock(&ttusb->semusb); 157 mutex_unlock(&ttusb->semusb);
158 return err; 158 return err;
159 } 159 }
160 if (actual_len != len) { 160 if (actual_len != len) {
161 dprintk("%s: only wrote %d of %d bytes\n", __FUNCTION__, 161 dprintk("%s: only wrote %d of %d bytes\n", __func__,
162 actual_len, len); 162 actual_len, len);
163 mutex_unlock(&ttusb->semusb); 163 mutex_unlock(&ttusb->semusb);
164 return -1; 164 return -1;
@@ -168,7 +168,7 @@ static int ttusb_cmd(struct ttusb *ttusb,
168 ttusb->last_result, 32, &actual_len, 1000); 168 ttusb->last_result, 32, &actual_len, 1000);
169 169
170 if (err != 0) { 170 if (err != 0) {
171 printk("%s: failed, receive error %d\n", __FUNCTION__, 171 printk("%s: failed, receive error %d\n", __func__,
172 err); 172 err);
173 mutex_unlock(&ttusb->semusb); 173 mutex_unlock(&ttusb->semusb);
174 return err; 174 return err;
@@ -229,7 +229,7 @@ static int ttusb_i2c_msg(struct ttusb *ttusb,
229 if (err || b[0] != 0x55 || b[1] != id) { 229 if (err || b[0] != 0x55 || b[1] != id) {
230 dprintk 230 dprintk
231 ("%s: usb_bulk_msg(recv) failed, err == %i, id == %02x, b == ", 231 ("%s: usb_bulk_msg(recv) failed, err == %i, id == %02x, b == ",
232 __FUNCTION__, err, id); 232 __func__, err, id);
233 return -EREMOTEIO; 233 return -EREMOTEIO;
234 } 234 }
235 235
@@ -273,7 +273,7 @@ static int master_xfer(struct i2c_adapter* adapter, struct i2c_msg *msg, int num
273 snd_buf, snd_len, rcv_buf, rcv_len); 273 snd_buf, snd_len, rcv_buf, rcv_len);
274 274
275 if (err < rcv_len) { 275 if (err < rcv_len) {
276 dprintk("%s: i == %i\n", __FUNCTION__, i); 276 dprintk("%s: i == %i\n", __func__, i);
277 break; 277 break;
278 } 278 }
279 279
@@ -327,7 +327,7 @@ static int ttusb_boot_dsp(struct ttusb *ttusb)
327 done: 327 done:
328 if (err) { 328 if (err) {
329 dprintk("%s: usb_bulk_msg() failed, return value %i!\n", 329 dprintk("%s: usb_bulk_msg() failed, return value %i!\n",
330 __FUNCTION__, err); 330 __func__, err);
331 } 331 }
332 332
333 return err; 333 return err;
@@ -427,7 +427,7 @@ static int ttusb_init_controller(struct ttusb *ttusb)
427 if ((err = ttusb_result(ttusb, get_version, sizeof(get_version)))) 427 if ((err = ttusb_result(ttusb, get_version, sizeof(get_version))))
428 return err; 428 return err;
429 429
430 dprintk("%s: stc-version: %c%c%c%c%c\n", __FUNCTION__, 430 dprintk("%s: stc-version: %c%c%c%c%c\n", __func__,
431 get_version[4], get_version[5], get_version[6], 431 get_version[4], get_version[5], get_version[6],
432 get_version[7], get_version[8]); 432 get_version[7], get_version[8]);
433 433
@@ -437,7 +437,7 @@ static int ttusb_init_controller(struct ttusb *ttusb)
437 memcmp(get_version + 4, "V 2.2", 5)) { 437 memcmp(get_version + 4, "V 2.2", 5)) {
438 printk 438 printk
439 ("%s: unknown STC version %c%c%c%c%c, please report!\n", 439 ("%s: unknown STC version %c%c%c%c%c, please report!\n",
440 __FUNCTION__, get_version[4], get_version[5], 440 __func__, get_version[4], get_version[5],
441 get_version[6], get_version[7], get_version[8]); 441 get_version[6], get_version[7], get_version[8]);
442 } 442 }
443 443
@@ -453,7 +453,7 @@ static int ttusb_init_controller(struct ttusb *ttusb)
453 ttusb_result(ttusb, get_dsp_version, sizeof(get_dsp_version)); 453 ttusb_result(ttusb, get_dsp_version, sizeof(get_dsp_version));
454 if (err) 454 if (err)
455 return err; 455 return err;
456 printk("%s: dsp-version: %c%c%c\n", __FUNCTION__, 456 printk("%s: dsp-version: %c%c%c\n", __func__,
457 get_dsp_version[4], get_dsp_version[5], get_dsp_version[6]); 457 get_dsp_version[4], get_dsp_version[5], get_dsp_version[6]);
458 return 0; 458 return 0;
459} 459}
@@ -476,7 +476,7 @@ static int ttusb_send_diseqc(struct dvb_frontend* fe,
476 /* Diseqc */ 476 /* Diseqc */
477 if ((err = ttusb_cmd(ttusb, b, 4 + b[3], 0))) { 477 if ((err = ttusb_cmd(ttusb, b, 4 + b[3], 0))) {
478 dprintk("%s: usb_bulk_msg() failed, return value %i!\n", 478 dprintk("%s: usb_bulk_msg() failed, return value %i!\n",
479 __FUNCTION__, err); 479 __func__, err);
480 } 480 }
481 481
482 return err; 482 return err;
@@ -494,7 +494,7 @@ static int ttusb_update_lnb(struct ttusb *ttusb)
494 /* SetLNB */ 494 /* SetLNB */
495 if ((err = ttusb_cmd(ttusb, b, sizeof(b), 0))) { 495 if ((err = ttusb_cmd(ttusb, b, sizeof(b), 0))) {
496 dprintk("%s: usb_bulk_msg() failed, return value %i!\n", 496 dprintk("%s: usb_bulk_msg() failed, return value %i!\n",
497 __FUNCTION__, err); 497 __func__, err);
498 } 498 }
499 499
500 return err; 500 return err;
@@ -528,7 +528,7 @@ static void ttusb_set_led_freq(struct ttusb *ttusb, u8 freq)
528 err = ttusb_cmd(ttusb, b, sizeof(b), 0); 528 err = ttusb_cmd(ttusb, b, sizeof(b), 0);
529 if (err) { 529 if (err) {
530 dprintk("%s: usb_bulk_msg() failed, return value %i!\n", 530 dprintk("%s: usb_bulk_msg() failed, return value %i!\n",
531 __FUNCTION__, err); 531 __func__, err);
532 } 532 }
533} 533}
534#endif 534#endif
@@ -554,7 +554,7 @@ static void ttusb_process_muxpack(struct ttusb *ttusb, const u8 * muxpack,
554 csum ^= le16_to_cpup((u16 *) (muxpack + i)); 554 csum ^= le16_to_cpup((u16 *) (muxpack + i));
555 if (csum) { 555 if (csum) {
556 printk("%s: muxpack with incorrect checksum, ignoring\n", 556 printk("%s: muxpack with incorrect checksum, ignoring\n",
557 __FUNCTION__); 557 __func__);
558 numinvalid++; 558 numinvalid++;
559 return; 559 return;
560 } 560 }
@@ -563,7 +563,7 @@ static void ttusb_process_muxpack(struct ttusb *ttusb, const u8 * muxpack,
563 cc &= 0x7FFF; 563 cc &= 0x7FFF;
564 if ((cc != ttusb->cc) && (ttusb->cc != -1)) 564 if ((cc != ttusb->cc) && (ttusb->cc != -1))
565 printk("%s: cc discontinuity (%d frames missing)\n", 565 printk("%s: cc discontinuity (%d frames missing)\n",
566 __FUNCTION__, (cc - ttusb->cc) & 0x7FFF); 566 __func__, (cc - ttusb->cc) & 0x7FFF);
567 ttusb->cc = (cc + 1) & 0x7FFF; 567 ttusb->cc = (cc + 1) & 0x7FFF;
568 if (muxpack[0] & 0x80) { 568 if (muxpack[0] & 0x80) {
569#ifdef TTUSB_HWSECTIONS 569#ifdef TTUSB_HWSECTIONS
@@ -613,7 +613,7 @@ static void ttusb_process_frame(struct ttusb *ttusb, u8 * data, int len)
613 int maxwork = 1024; 613 int maxwork = 1024;
614 while (len) { 614 while (len) {
615 if (!(maxwork--)) { 615 if (!(maxwork--)) {
616 printk("%s: too much work\n", __FUNCTION__); 616 printk("%s: too much work\n", __func__);
617 break; 617 break;
618 } 618 }
619 619
@@ -632,7 +632,7 @@ static void ttusb_process_frame(struct ttusb *ttusb, u8 * data, int len)
632#else 632#else
633 if (ttusb->insync) { 633 if (ttusb->insync) {
634 printk("%s: lost sync.\n", 634 printk("%s: lost sync.\n",
635 __FUNCTION__); 635 __func__);
636 ttusb->insync = 0; 636 ttusb->insync = 0;
637 } 637 }
638#endif 638#endif
@@ -691,7 +691,7 @@ static void ttusb_process_frame(struct ttusb *ttusb, u8 * data, int len)
691 else { 691 else {
692 dprintk 692 dprintk
693 ("%s: invalid state: first byte is %x\n", 693 ("%s: invalid state: first byte is %x\n",
694 __FUNCTION__, 694 __func__,
695 ttusb->muxpack[0]); 695 ttusb->muxpack[0]);
696 ttusb->mux_state = 0; 696 ttusb->mux_state = 0;
697 } 697 }
@@ -740,7 +740,7 @@ static void ttusb_iso_irq(struct urb *urb)
740 740
741#if 0 741#if 0
742 printk("%s: status %d, errcount == %d, length == %i\n", 742 printk("%s: status %d, errcount == %d, length == %i\n",
743 __FUNCTION__, 743 __func__,
744 urb->status, urb->error_count, urb->actual_length); 744 urb->status, urb->error_count, urb->actual_length);
745#endif 745#endif
746 746
@@ -833,7 +833,7 @@ static int ttusb_start_iso_xfer(struct ttusb *ttusb)
833 int i, j, err, buffer_offset = 0; 833 int i, j, err, buffer_offset = 0;
834 834
835 if (ttusb->iso_streaming) { 835 if (ttusb->iso_streaming) {
836 printk("%s: iso xfer already running!\n", __FUNCTION__); 836 printk("%s: iso xfer already running!\n", __func__);
837 return 0; 837 return 0;
838 } 838 }
839 839
@@ -869,7 +869,7 @@ static int ttusb_start_iso_xfer(struct ttusb *ttusb)
869 ttusb_stop_iso_xfer(ttusb); 869 ttusb_stop_iso_xfer(ttusb);
870 printk 870 printk
871 ("%s: failed urb submission (%i: err = %i)!\n", 871 ("%s: failed urb submission (%i: err = %i)!\n",
872 __FUNCTION__, i, err); 872 __func__, i, err);
873 return err; 873 return err;
874 } 874 }
875 } 875 }
@@ -1643,7 +1643,7 @@ static int ttusb_probe(struct usb_interface *intf, const struct usb_device_id *i
1643 struct ttusb *ttusb; 1643 struct ttusb *ttusb;
1644 int result; 1644 int result;
1645 1645
1646 dprintk("%s: TTUSB DVB connected\n", __FUNCTION__); 1646 dprintk("%s: TTUSB DVB connected\n", __func__);
1647 1647
1648 udev = interface_to_usbdev(intf); 1648 udev = interface_to_usbdev(intf);
1649 1649
@@ -1773,7 +1773,7 @@ static void ttusb_disconnect(struct usb_interface *intf)
1773 1773
1774 kfree(ttusb); 1774 kfree(ttusb);
1775 1775
1776 dprintk("%s: TTUSB DVB disconnected\n", __FUNCTION__); 1776 dprintk("%s: TTUSB DVB disconnected\n", __func__);
1777} 1777}
1778 1778
1779static struct usb_device_id ttusb_table[] = { 1779static struct usb_device_id ttusb_table[] = {