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 | e9815ceea9733dfb236629f5b72f2e6486f66242 (patch) | |
tree | 89259703ae56171bee8790ff888d3c68f145e5c1 /drivers/media/dvb | |
parent | fb9393b519fb27714d14625bc3042b669933e81a (diff) |
V4L/DVB (7517): media/dvb/ttusb-dec 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-dec/ttusb_dec.c | 106 | ||||
-rw-r--r-- | drivers/media/dvb/ttusb-dec/ttusbdecfe.c | 4 |
2 files changed, 55 insertions, 55 deletions
diff --git a/drivers/media/dvb/ttusb-dec/ttusb_dec.c b/drivers/media/dvb/ttusb-dec/ttusb_dec.c index 1ec981d98b9..95110c48331 100644 --- a/drivers/media/dvb/ttusb-dec/ttusb_dec.c +++ b/drivers/media/dvb/ttusb-dec/ttusb_dec.c | |||
@@ -217,11 +217,11 @@ static void ttusb_dec_handle_irq( struct urb *urb) | |||
217 | case -ETIME: | 217 | case -ETIME: |
218 | /* this urb is dead, cleanup */ | 218 | /* this urb is dead, cleanup */ |
219 | dprintk("%s:urb shutting down with status: %d\n", | 219 | dprintk("%s:urb shutting down with status: %d\n", |
220 | __FUNCTION__, urb->status); | 220 | __func__, urb->status); |
221 | return; | 221 | return; |
222 | default: | 222 | default: |
223 | dprintk("%s:nonzero status received: %d\n", | 223 | dprintk("%s:nonzero status received: %d\n", |
224 | __FUNCTION__,urb->status); | 224 | __func__,urb->status); |
225 | goto exit; | 225 | goto exit; |
226 | } | 226 | } |
227 | 227 | ||
@@ -235,7 +235,7 @@ static void ttusb_dec_handle_irq( struct urb *urb) | |||
235 | * keyrepeat signal is recieved for lets say 200ms. | 235 | * keyrepeat signal is recieved for lets say 200ms. |
236 | * this should/could be added later ... | 236 | * this should/could be added later ... |
237 | * for now lets report each signal as a key down and up*/ | 237 | * for now lets report each signal as a key down and up*/ |
238 | dprintk("%s:rc signal:%d\n", __FUNCTION__, buffer[4]); | 238 | dprintk("%s:rc signal:%d\n", __func__, buffer[4]); |
239 | input_report_key(dec->rc_input_dev, rc_keys[buffer[4] - 1], 1); | 239 | input_report_key(dec->rc_input_dev, rc_keys[buffer[4] - 1], 1); |
240 | input_sync(dec->rc_input_dev); | 240 | input_sync(dec->rc_input_dev); |
241 | input_report_key(dec->rc_input_dev, rc_keys[buffer[4] - 1], 0); | 241 | input_report_key(dec->rc_input_dev, rc_keys[buffer[4] - 1], 0); |
@@ -245,7 +245,7 @@ static void ttusb_dec_handle_irq( struct urb *urb) | |||
245 | exit: retval = usb_submit_urb(urb, GFP_ATOMIC); | 245 | exit: retval = usb_submit_urb(urb, GFP_ATOMIC); |
246 | if(retval) | 246 | if(retval) |
247 | printk("%s - usb_commit_urb failed with result: %d\n", | 247 | printk("%s - usb_commit_urb failed with result: %d\n", |
248 | __FUNCTION__, retval); | 248 | __func__, retval); |
249 | } | 249 | } |
250 | 250 | ||
251 | static u16 crc16(u16 crc, const u8 *buf, size_t len) | 251 | static u16 crc16(u16 crc, const u8 *buf, size_t len) |
@@ -268,7 +268,7 @@ static int ttusb_dec_send_command(struct ttusb_dec *dec, const u8 command, | |||
268 | int result, actual_len, i; | 268 | int result, actual_len, i; |
269 | u8 *b; | 269 | u8 *b; |
270 | 270 | ||
271 | dprintk("%s\n", __FUNCTION__); | 271 | dprintk("%s\n", __func__); |
272 | 272 | ||
273 | b = kmalloc(COMMAND_PACKET_SIZE + 4, GFP_KERNEL); | 273 | b = kmalloc(COMMAND_PACKET_SIZE + 4, GFP_KERNEL); |
274 | if (!b) | 274 | if (!b) |
@@ -276,7 +276,7 @@ static int ttusb_dec_send_command(struct ttusb_dec *dec, const u8 command, | |||
276 | 276 | ||
277 | if ((result = mutex_lock_interruptible(&dec->usb_mutex))) { | 277 | if ((result = mutex_lock_interruptible(&dec->usb_mutex))) { |
278 | kfree(b); | 278 | kfree(b); |
279 | printk("%s: Failed to lock usb mutex.\n", __FUNCTION__); | 279 | printk("%s: Failed to lock usb mutex.\n", __func__); |
280 | return result; | 280 | return result; |
281 | } | 281 | } |
282 | 282 | ||
@@ -289,7 +289,7 @@ static int ttusb_dec_send_command(struct ttusb_dec *dec, const u8 command, | |||
289 | memcpy(&b[4], params, param_length); | 289 | memcpy(&b[4], params, param_length); |
290 | 290 | ||
291 | if (debug) { | 291 | if (debug) { |
292 | printk("%s: command: ", __FUNCTION__); | 292 | printk("%s: command: ", __func__); |
293 | for (i = 0; i < param_length + 4; i++) | 293 | for (i = 0; i < param_length + 4; i++) |
294 | printk("0x%02X ", b[i]); | 294 | printk("0x%02X ", b[i]); |
295 | printk("\n"); | 295 | printk("\n"); |
@@ -300,7 +300,7 @@ static int ttusb_dec_send_command(struct ttusb_dec *dec, const u8 command, | |||
300 | 300 | ||
301 | if (result) { | 301 | if (result) { |
302 | printk("%s: command bulk message failed: error %d\n", | 302 | printk("%s: command bulk message failed: error %d\n", |
303 | __FUNCTION__, result); | 303 | __func__, result); |
304 | mutex_unlock(&dec->usb_mutex); | 304 | mutex_unlock(&dec->usb_mutex); |
305 | kfree(b); | 305 | kfree(b); |
306 | return result; | 306 | return result; |
@@ -311,13 +311,13 @@ static int ttusb_dec_send_command(struct ttusb_dec *dec, const u8 command, | |||
311 | 311 | ||
312 | if (result) { | 312 | if (result) { |
313 | printk("%s: result bulk message failed: error %d\n", | 313 | printk("%s: result bulk message failed: error %d\n", |
314 | __FUNCTION__, result); | 314 | __func__, result); |
315 | mutex_unlock(&dec->usb_mutex); | 315 | mutex_unlock(&dec->usb_mutex); |
316 | kfree(b); | 316 | kfree(b); |
317 | return result; | 317 | return result; |
318 | } else { | 318 | } else { |
319 | if (debug) { | 319 | if (debug) { |
320 | printk("%s: result: ", __FUNCTION__); | 320 | printk("%s: result: ", __func__); |
321 | for (i = 0; i < actual_len; i++) | 321 | for (i = 0; i < actual_len; i++) |
322 | printk("0x%02X ", b[i]); | 322 | printk("0x%02X ", b[i]); |
323 | printk("\n"); | 323 | printk("\n"); |
@@ -343,7 +343,7 @@ static int ttusb_dec_get_stb_state (struct ttusb_dec *dec, unsigned int *mode, | |||
343 | int result; | 343 | int result; |
344 | unsigned int tmp; | 344 | unsigned int tmp; |
345 | 345 | ||
346 | dprintk("%s\n", __FUNCTION__); | 346 | dprintk("%s\n", __func__); |
347 | 347 | ||
348 | result = ttusb_dec_send_command(dec, 0x08, 0, NULL, &c_length, c); | 348 | result = ttusb_dec_send_command(dec, 0x08, 0, NULL, &c_length, c); |
349 | if (result) | 349 | if (result) |
@@ -400,7 +400,7 @@ static void ttusb_dec_set_pids(struct ttusb_dec *dec) | |||
400 | u16 audio = htons(dec->pid[DMX_PES_AUDIO]); | 400 | u16 audio = htons(dec->pid[DMX_PES_AUDIO]); |
401 | u16 video = htons(dec->pid[DMX_PES_VIDEO]); | 401 | u16 video = htons(dec->pid[DMX_PES_VIDEO]); |
402 | 402 | ||
403 | dprintk("%s\n", __FUNCTION__); | 403 | dprintk("%s\n", __func__); |
404 | 404 | ||
405 | memcpy(&b[0], &pcr, 2); | 405 | memcpy(&b[0], &pcr, 2); |
406 | memcpy(&b[2], &audio, 2); | 406 | memcpy(&b[2], &audio, 2); |
@@ -419,12 +419,12 @@ static void ttusb_dec_set_pids(struct ttusb_dec *dec) | |||
419 | static void ttusb_dec_process_pva(struct ttusb_dec *dec, u8 *pva, int length) | 419 | static void ttusb_dec_process_pva(struct ttusb_dec *dec, u8 *pva, int length) |
420 | { | 420 | { |
421 | if (length < 8) { | 421 | if (length < 8) { |
422 | printk("%s: packet too short - discarding\n", __FUNCTION__); | 422 | printk("%s: packet too short - discarding\n", __func__); |
423 | return; | 423 | return; |
424 | } | 424 | } |
425 | 425 | ||
426 | if (length > 8 + MAX_PVA_LENGTH) { | 426 | if (length > 8 + MAX_PVA_LENGTH) { |
427 | printk("%s: packet too long - discarding\n", __FUNCTION__); | 427 | printk("%s: packet too long - discarding\n", __func__); |
428 | return; | 428 | return; |
429 | } | 429 | } |
430 | 430 | ||
@@ -507,7 +507,7 @@ static void ttusb_dec_process_pva(struct ttusb_dec *dec, u8 *pva, int length) | |||
507 | break; | 507 | break; |
508 | 508 | ||
509 | default: | 509 | default: |
510 | printk("%s: unknown PVA type: %02x.\n", __FUNCTION__, | 510 | printk("%s: unknown PVA type: %02x.\n", __func__, |
511 | pva[2]); | 511 | pva[2]); |
512 | break; | 512 | break; |
513 | } | 513 | } |
@@ -546,7 +546,7 @@ static void ttusb_dec_process_packet(struct ttusb_dec *dec) | |||
546 | u16 packet_id; | 546 | u16 packet_id; |
547 | 547 | ||
548 | if (dec->packet_length % 2) { | 548 | if (dec->packet_length % 2) { |
549 | printk("%s: odd sized packet - discarding\n", __FUNCTION__); | 549 | printk("%s: odd sized packet - discarding\n", __func__); |
550 | return; | 550 | return; |
551 | } | 551 | } |
552 | 552 | ||
@@ -554,7 +554,7 @@ static void ttusb_dec_process_packet(struct ttusb_dec *dec) | |||
554 | csum ^= ((dec->packet[i] << 8) + dec->packet[i + 1]); | 554 | csum ^= ((dec->packet[i] << 8) + dec->packet[i + 1]); |
555 | 555 | ||
556 | if (csum) { | 556 | if (csum) { |
557 | printk("%s: checksum failed - discarding\n", __FUNCTION__); | 557 | printk("%s: checksum failed - discarding\n", __func__); |
558 | return; | 558 | return; |
559 | } | 559 | } |
560 | 560 | ||
@@ -563,7 +563,7 @@ static void ttusb_dec_process_packet(struct ttusb_dec *dec) | |||
563 | 563 | ||
564 | if ((packet_id != dec->next_packet_id) && dec->next_packet_id) { | 564 | if ((packet_id != dec->next_packet_id) && dec->next_packet_id) { |
565 | printk("%s: warning: lost packets between %u and %u\n", | 565 | printk("%s: warning: lost packets between %u and %u\n", |
566 | __FUNCTION__, dec->next_packet_id - 1, packet_id); | 566 | __func__, dec->next_packet_id - 1, packet_id); |
567 | } | 567 | } |
568 | 568 | ||
569 | if (packet_id == 0xffff) | 569 | if (packet_id == 0xffff) |
@@ -652,7 +652,7 @@ static void ttusb_dec_process_urb_frame(struct ttusb_dec *dec, u8 *b, | |||
652 | dec->packet_state = 7; | 652 | dec->packet_state = 7; |
653 | } else { | 653 | } else { |
654 | printk("%s: unknown packet type: " | 654 | printk("%s: unknown packet type: " |
655 | "%02x%02x\n", __FUNCTION__, | 655 | "%02x%02x\n", __func__, |
656 | dec->packet[0], dec->packet[1]); | 656 | dec->packet[0], dec->packet[1]); |
657 | dec->packet_state = 0; | 657 | dec->packet_state = 0; |
658 | } | 658 | } |
@@ -724,7 +724,7 @@ static void ttusb_dec_process_urb_frame(struct ttusb_dec *dec, u8 *b, | |||
724 | 724 | ||
725 | default: | 725 | default: |
726 | printk("%s: illegal packet state encountered.\n", | 726 | printk("%s: illegal packet state encountered.\n", |
727 | __FUNCTION__); | 727 | __func__); |
728 | dec->packet_state = 0; | 728 | dec->packet_state = 0; |
729 | } | 729 | } |
730 | } | 730 | } |
@@ -792,7 +792,7 @@ static void ttusb_dec_process_urb(struct urb *urb) | |||
792 | } else { | 792 | } else { |
793 | /* -ENOENT is expected when unlinking urbs */ | 793 | /* -ENOENT is expected when unlinking urbs */ |
794 | if (urb->status != -ENOENT) | 794 | if (urb->status != -ENOENT) |
795 | dprintk("%s: urb error: %d\n", __FUNCTION__, | 795 | dprintk("%s: urb error: %d\n", __func__, |
796 | urb->status); | 796 | urb->status); |
797 | } | 797 | } |
798 | 798 | ||
@@ -804,7 +804,7 @@ static void ttusb_dec_setup_urbs(struct ttusb_dec *dec) | |||
804 | { | 804 | { |
805 | int i, j, buffer_offset = 0; | 805 | int i, j, buffer_offset = 0; |
806 | 806 | ||
807 | dprintk("%s\n", __FUNCTION__); | 807 | dprintk("%s\n", __func__); |
808 | 808 | ||
809 | for (i = 0; i < ISO_BUF_COUNT; i++) { | 809 | for (i = 0; i < ISO_BUF_COUNT; i++) { |
810 | int frame_offset = 0; | 810 | int frame_offset = 0; |
@@ -834,7 +834,7 @@ static void ttusb_dec_stop_iso_xfer(struct ttusb_dec *dec) | |||
834 | { | 834 | { |
835 | int i; | 835 | int i; |
836 | 836 | ||
837 | dprintk("%s\n", __FUNCTION__); | 837 | dprintk("%s\n", __func__); |
838 | 838 | ||
839 | if (mutex_lock_interruptible(&dec->iso_mutex)) | 839 | if (mutex_lock_interruptible(&dec->iso_mutex)) |
840 | return; | 840 | return; |
@@ -889,7 +889,7 @@ static int ttusb_dec_start_iso_xfer(struct ttusb_dec *dec) | |||
889 | { | 889 | { |
890 | int i, result; | 890 | int i, result; |
891 | 891 | ||
892 | dprintk("%s\n", __FUNCTION__); | 892 | dprintk("%s\n", __func__); |
893 | 893 | ||
894 | if (mutex_lock_interruptible(&dec->iso_mutex)) | 894 | if (mutex_lock_interruptible(&dec->iso_mutex)) |
895 | return -EAGAIN; | 895 | return -EAGAIN; |
@@ -905,7 +905,7 @@ static int ttusb_dec_start_iso_xfer(struct ttusb_dec *dec) | |||
905 | if ((result = usb_submit_urb(dec->iso_urb[i], | 905 | if ((result = usb_submit_urb(dec->iso_urb[i], |
906 | GFP_ATOMIC))) { | 906 | GFP_ATOMIC))) { |
907 | printk("%s: failed urb submission %d: " | 907 | printk("%s: failed urb submission %d: " |
908 | "error %d\n", __FUNCTION__, i, result); | 908 | "error %d\n", __func__, i, result); |
909 | 909 | ||
910 | while (i) { | 910 | while (i) { |
911 | usb_kill_urb(dec->iso_urb[i - 1]); | 911 | usb_kill_urb(dec->iso_urb[i - 1]); |
@@ -932,7 +932,7 @@ static int ttusb_dec_start_ts_feed(struct dvb_demux_feed *dvbdmxfeed) | |||
932 | u8 b0[] = { 0x05 }; | 932 | u8 b0[] = { 0x05 }; |
933 | int result = 0; | 933 | int result = 0; |
934 | 934 | ||
935 | dprintk("%s\n", __FUNCTION__); | 935 | dprintk("%s\n", __func__); |
936 | 936 | ||
937 | dprintk(" ts_type:"); | 937 | dprintk(" ts_type:"); |
938 | 938 | ||
@@ -1012,7 +1012,7 @@ static int ttusb_dec_start_sec_feed(struct dvb_demux_feed *dvbdmxfeed) | |||
1012 | unsigned long flags; | 1012 | unsigned long flags; |
1013 | u8 x = 1; | 1013 | u8 x = 1; |
1014 | 1014 | ||
1015 | dprintk("%s\n", __FUNCTION__); | 1015 | dprintk("%s\n", __func__); |
1016 | 1016 | ||
1017 | pid = htons(dvbdmxfeed->pid); | 1017 | pid = htons(dvbdmxfeed->pid); |
1018 | memcpy(&b0[0], &pid, 2); | 1018 | memcpy(&b0[0], &pid, 2); |
@@ -1052,7 +1052,7 @@ static int ttusb_dec_start_feed(struct dvb_demux_feed *dvbdmxfeed) | |||
1052 | { | 1052 | { |
1053 | struct dvb_demux *dvbdmx = dvbdmxfeed->demux; | 1053 | struct dvb_demux *dvbdmx = dvbdmxfeed->demux; |
1054 | 1054 | ||
1055 | dprintk("%s\n", __FUNCTION__); | 1055 | dprintk("%s\n", __func__); |
1056 | 1056 | ||
1057 | if (!dvbdmx->dmx.frontend) | 1057 | if (!dvbdmx->dmx.frontend) |
1058 | return -EINVAL; | 1058 | return -EINVAL; |
@@ -1113,7 +1113,7 @@ static int ttusb_dec_stop_sec_feed(struct dvb_demux_feed *dvbdmxfeed) | |||
1113 | 1113 | ||
1114 | static int ttusb_dec_stop_feed(struct dvb_demux_feed *dvbdmxfeed) | 1114 | static int ttusb_dec_stop_feed(struct dvb_demux_feed *dvbdmxfeed) |
1115 | { | 1115 | { |
1116 | dprintk("%s\n", __FUNCTION__); | 1116 | dprintk("%s\n", __func__); |
1117 | 1117 | ||
1118 | switch (dvbdmxfeed->type) { | 1118 | switch (dvbdmxfeed->type) { |
1119 | case DMX_TYPE_TS: | 1119 | case DMX_TYPE_TS: |
@@ -1132,7 +1132,7 @@ static void ttusb_dec_free_iso_urbs(struct ttusb_dec *dec) | |||
1132 | { | 1132 | { |
1133 | int i; | 1133 | int i; |
1134 | 1134 | ||
1135 | dprintk("%s\n", __FUNCTION__); | 1135 | dprintk("%s\n", __func__); |
1136 | 1136 | ||
1137 | for (i = 0; i < ISO_BUF_COUNT; i++) | 1137 | for (i = 0; i < ISO_BUF_COUNT; i++) |
1138 | usb_free_urb(dec->iso_urb[i]); | 1138 | usb_free_urb(dec->iso_urb[i]); |
@@ -1147,7 +1147,7 @@ static int ttusb_dec_alloc_iso_urbs(struct ttusb_dec *dec) | |||
1147 | { | 1147 | { |
1148 | int i; | 1148 | int i; |
1149 | 1149 | ||
1150 | dprintk("%s\n", __FUNCTION__); | 1150 | dprintk("%s\n", __func__); |
1151 | 1151 | ||
1152 | dec->iso_buffer = pci_alloc_consistent(NULL, | 1152 | dec->iso_buffer = pci_alloc_consistent(NULL, |
1153 | ISO_FRAME_SIZE * | 1153 | ISO_FRAME_SIZE * |
@@ -1214,7 +1214,7 @@ static int ttusb_init_rc( struct ttusb_dec *dec) | |||
1214 | 1214 | ||
1215 | dec->rc_input_dev = input_dev; | 1215 | dec->rc_input_dev = input_dev; |
1216 | if (usb_submit_urb(dec->irq_urb, GFP_KERNEL)) | 1216 | if (usb_submit_urb(dec->irq_urb, GFP_KERNEL)) |
1217 | printk("%s: usb_submit_urb failed\n",__FUNCTION__); | 1217 | printk("%s: usb_submit_urb failed\n",__func__); |
1218 | /* enable irq pipe */ | 1218 | /* enable irq pipe */ |
1219 | ttusb_dec_send_command(dec,0xb0,sizeof(b),b,NULL,NULL); | 1219 | ttusb_dec_send_command(dec,0xb0,sizeof(b),b,NULL,NULL); |
1220 | 1220 | ||
@@ -1223,7 +1223,7 @@ static int ttusb_init_rc( struct ttusb_dec *dec) | |||
1223 | 1223 | ||
1224 | static void ttusb_dec_init_v_pes(struct ttusb_dec *dec) | 1224 | static void ttusb_dec_init_v_pes(struct ttusb_dec *dec) |
1225 | { | 1225 | { |
1226 | dprintk("%s\n", __FUNCTION__); | 1226 | dprintk("%s\n", __func__); |
1227 | 1227 | ||
1228 | dec->v_pes[0] = 0x00; | 1228 | dec->v_pes[0] = 0x00; |
1229 | dec->v_pes[1] = 0x00; | 1229 | dec->v_pes[1] = 0x00; |
@@ -1233,7 +1233,7 @@ static void ttusb_dec_init_v_pes(struct ttusb_dec *dec) | |||
1233 | 1233 | ||
1234 | static int ttusb_dec_init_usb(struct ttusb_dec *dec) | 1234 | static int ttusb_dec_init_usb(struct ttusb_dec *dec) |
1235 | { | 1235 | { |
1236 | dprintk("%s\n", __FUNCTION__); | 1236 | dprintk("%s\n", __func__); |
1237 | 1237 | ||
1238 | mutex_init(&dec->usb_mutex); | 1238 | mutex_init(&dec->usb_mutex); |
1239 | mutex_init(&dec->iso_mutex); | 1239 | mutex_init(&dec->iso_mutex); |
@@ -1281,11 +1281,11 @@ static int ttusb_dec_boot_dsp(struct ttusb_dec *dec) | |||
1281 | u32 crc32_csum, crc32_check, tmp; | 1281 | u32 crc32_csum, crc32_check, tmp; |
1282 | const struct firmware *fw_entry = NULL; | 1282 | const struct firmware *fw_entry = NULL; |
1283 | 1283 | ||
1284 | dprintk("%s\n", __FUNCTION__); | 1284 | dprintk("%s\n", __func__); |
1285 | 1285 | ||
1286 | if (request_firmware(&fw_entry, dec->firmware_name, &dec->udev->dev)) { | 1286 | if (request_firmware(&fw_entry, dec->firmware_name, &dec->udev->dev)) { |
1287 | printk(KERN_ERR "%s: Firmware (%s) unavailable.\n", | 1287 | printk(KERN_ERR "%s: Firmware (%s) unavailable.\n", |
1288 | __FUNCTION__, dec->firmware_name); | 1288 | __func__, dec->firmware_name); |
1289 | return 1; | 1289 | return 1; |
1290 | } | 1290 | } |
1291 | 1291 | ||
@@ -1294,7 +1294,7 @@ static int ttusb_dec_boot_dsp(struct ttusb_dec *dec) | |||
1294 | 1294 | ||
1295 | if (firmware_size < 60) { | 1295 | if (firmware_size < 60) { |
1296 | printk("%s: firmware size too small for DSP code (%zu < 60).\n", | 1296 | printk("%s: firmware size too small for DSP code (%zu < 60).\n", |
1297 | __FUNCTION__, firmware_size); | 1297 | __func__, firmware_size); |
1298 | release_firmware(fw_entry); | 1298 | release_firmware(fw_entry); |
1299 | return -1; | 1299 | return -1; |
1300 | } | 1300 | } |
@@ -1308,7 +1308,7 @@ static int ttusb_dec_boot_dsp(struct ttusb_dec *dec) | |||
1308 | if (crc32_csum != crc32_check) { | 1308 | if (crc32_csum != crc32_check) { |
1309 | printk("%s: crc32 check of DSP code failed (calculated " | 1309 | printk("%s: crc32 check of DSP code failed (calculated " |
1310 | "0x%08x != 0x%08x in file), file invalid.\n", | 1310 | "0x%08x != 0x%08x in file), file invalid.\n", |
1311 | __FUNCTION__, crc32_csum, crc32_check); | 1311 | __func__, crc32_csum, crc32_check); |
1312 | release_firmware(fw_entry); | 1312 | release_firmware(fw_entry); |
1313 | return -1; | 1313 | return -1; |
1314 | } | 1314 | } |
@@ -1376,7 +1376,7 @@ static int ttusb_dec_init_stb(struct ttusb_dec *dec) | |||
1376 | int result; | 1376 | int result; |
1377 | unsigned int mode, model, version; | 1377 | unsigned int mode, model, version; |
1378 | 1378 | ||
1379 | dprintk("%s\n", __FUNCTION__); | 1379 | dprintk("%s\n", __func__); |
1380 | 1380 | ||
1381 | result = ttusb_dec_get_stb_state(dec, &mode, &model, &version); | 1381 | result = ttusb_dec_get_stb_state(dec, &mode, &model, &version); |
1382 | 1382 | ||
@@ -1415,7 +1415,7 @@ static int ttusb_dec_init_stb(struct ttusb_dec *dec) | |||
1415 | default: | 1415 | default: |
1416 | printk(KERN_ERR "%s: unknown model returned " | 1416 | printk(KERN_ERR "%s: unknown model returned " |
1417 | "by firmware (%08x) - please report\n", | 1417 | "by firmware (%08x) - please report\n", |
1418 | __FUNCTION__, model); | 1418 | __func__, model); |
1419 | return -1; | 1419 | return -1; |
1420 | break; | 1420 | break; |
1421 | } | 1421 | } |
@@ -1434,12 +1434,12 @@ static int ttusb_dec_init_dvb(struct ttusb_dec *dec) | |||
1434 | { | 1434 | { |
1435 | int result; | 1435 | int result; |
1436 | 1436 | ||
1437 | dprintk("%s\n", __FUNCTION__); | 1437 | dprintk("%s\n", __func__); |
1438 | 1438 | ||
1439 | if ((result = dvb_register_adapter(&dec->adapter, | 1439 | if ((result = dvb_register_adapter(&dec->adapter, |
1440 | dec->model_name, THIS_MODULE, &dec->udev->dev)) < 0) { | 1440 | dec->model_name, THIS_MODULE, &dec->udev->dev)) < 0) { |
1441 | printk("%s: dvb_register_adapter failed: error %d\n", | 1441 | printk("%s: dvb_register_adapter failed: error %d\n", |
1442 | __FUNCTION__, result); | 1442 | __func__, result); |
1443 | 1443 | ||
1444 | return result; | 1444 | return result; |
1445 | } | 1445 | } |
@@ -1454,7 +1454,7 @@ static int ttusb_dec_init_dvb(struct ttusb_dec *dec) | |||
1454 | dec->demux.write_to_decoder = NULL; | 1454 | dec->demux.write_to_decoder = NULL; |
1455 | 1455 | ||
1456 | if ((result = dvb_dmx_init(&dec->demux)) < 0) { | 1456 | if ((result = dvb_dmx_init(&dec->demux)) < 0) { |
1457 | printk("%s: dvb_dmx_init failed: error %d\n", __FUNCTION__, | 1457 | printk("%s: dvb_dmx_init failed: error %d\n", __func__, |
1458 | result); | 1458 | result); |
1459 | 1459 | ||
1460 | dvb_unregister_adapter(&dec->adapter); | 1460 | dvb_unregister_adapter(&dec->adapter); |
@@ -1468,7 +1468,7 @@ static int ttusb_dec_init_dvb(struct ttusb_dec *dec) | |||
1468 | 1468 | ||
1469 | if ((result = dvb_dmxdev_init(&dec->dmxdev, &dec->adapter)) < 0) { | 1469 | if ((result = dvb_dmxdev_init(&dec->dmxdev, &dec->adapter)) < 0) { |
1470 | printk("%s: dvb_dmxdev_init failed: error %d\n", | 1470 | printk("%s: dvb_dmxdev_init failed: error %d\n", |
1471 | __FUNCTION__, result); | 1471 | __func__, result); |
1472 | 1472 | ||
1473 | dvb_dmx_release(&dec->demux); | 1473 | dvb_dmx_release(&dec->demux); |
1474 | dvb_unregister_adapter(&dec->adapter); | 1474 | dvb_unregister_adapter(&dec->adapter); |
@@ -1480,7 +1480,7 @@ static int ttusb_dec_init_dvb(struct ttusb_dec *dec) | |||
1480 | 1480 | ||
1481 | if ((result = dec->demux.dmx.add_frontend(&dec->demux.dmx, | 1481 | if ((result = dec->demux.dmx.add_frontend(&dec->demux.dmx, |
1482 | &dec->frontend)) < 0) { | 1482 | &dec->frontend)) < 0) { |
1483 | printk("%s: dvb_dmx_init failed: error %d\n", __FUNCTION__, | 1483 | printk("%s: dvb_dmx_init failed: error %d\n", __func__, |
1484 | result); | 1484 | result); |
1485 | 1485 | ||
1486 | dvb_dmxdev_release(&dec->dmxdev); | 1486 | dvb_dmxdev_release(&dec->dmxdev); |
@@ -1492,7 +1492,7 @@ static int ttusb_dec_init_dvb(struct ttusb_dec *dec) | |||
1492 | 1492 | ||
1493 | if ((result = dec->demux.dmx.connect_frontend(&dec->demux.dmx, | 1493 | if ((result = dec->demux.dmx.connect_frontend(&dec->demux.dmx, |
1494 | &dec->frontend)) < 0) { | 1494 | &dec->frontend)) < 0) { |
1495 | printk("%s: dvb_dmx_init failed: error %d\n", __FUNCTION__, | 1495 | printk("%s: dvb_dmx_init failed: error %d\n", __func__, |
1496 | result); | 1496 | result); |
1497 | 1497 | ||
1498 | dec->demux.dmx.remove_frontend(&dec->demux.dmx, &dec->frontend); | 1498 | dec->demux.dmx.remove_frontend(&dec->demux.dmx, &dec->frontend); |
@@ -1510,7 +1510,7 @@ static int ttusb_dec_init_dvb(struct ttusb_dec *dec) | |||
1510 | 1510 | ||
1511 | static void ttusb_dec_exit_dvb(struct ttusb_dec *dec) | 1511 | static void ttusb_dec_exit_dvb(struct ttusb_dec *dec) |
1512 | { | 1512 | { |
1513 | dprintk("%s\n", __FUNCTION__); | 1513 | dprintk("%s\n", __func__); |
1514 | 1514 | ||
1515 | dvb_net_release(&dec->dvb_net); | 1515 | dvb_net_release(&dec->dvb_net); |
1516 | dec->demux.dmx.close(&dec->demux.dmx); | 1516 | dec->demux.dmx.close(&dec->demux.dmx); |
@@ -1528,7 +1528,7 @@ static void ttusb_dec_exit_dvb(struct ttusb_dec *dec) | |||
1528 | static void ttusb_dec_exit_rc(struct ttusb_dec *dec) | 1528 | static void ttusb_dec_exit_rc(struct ttusb_dec *dec) |
1529 | { | 1529 | { |
1530 | 1530 | ||
1531 | dprintk("%s\n", __FUNCTION__); | 1531 | dprintk("%s\n", __func__); |
1532 | /* we have to check whether the irq URB is already submitted. | 1532 | /* we have to check whether the irq URB is already submitted. |
1533 | * As the irq is submitted after the interface is changed, | 1533 | * As the irq is submitted after the interface is changed, |
1534 | * this is the best method i figured out. | 1534 | * this is the best method i figured out. |
@@ -1552,7 +1552,7 @@ static void ttusb_dec_exit_usb(struct ttusb_dec *dec) | |||
1552 | { | 1552 | { |
1553 | int i; | 1553 | int i; |
1554 | 1554 | ||
1555 | dprintk("%s\n", __FUNCTION__); | 1555 | dprintk("%s\n", __func__); |
1556 | 1556 | ||
1557 | dec->iso_stream_count = 0; | 1557 | dec->iso_stream_count = 0; |
1558 | 1558 | ||
@@ -1612,12 +1612,12 @@ static int ttusb_dec_probe(struct usb_interface *intf, | |||
1612 | struct usb_device *udev; | 1612 | struct usb_device *udev; |
1613 | struct ttusb_dec *dec; | 1613 | struct ttusb_dec *dec; |
1614 | 1614 | ||
1615 | dprintk("%s\n", __FUNCTION__); | 1615 | dprintk("%s\n", __func__); |
1616 | 1616 | ||
1617 | udev = interface_to_usbdev(intf); | 1617 | udev = interface_to_usbdev(intf); |
1618 | 1618 | ||
1619 | if (!(dec = kzalloc(sizeof(struct ttusb_dec), GFP_KERNEL))) { | 1619 | if (!(dec = kzalloc(sizeof(struct ttusb_dec), GFP_KERNEL))) { |
1620 | printk("%s: couldn't allocate memory.\n", __FUNCTION__); | 1620 | printk("%s: couldn't allocate memory.\n", __func__); |
1621 | return -ENOMEM; | 1621 | return -ENOMEM; |
1622 | } | 1622 | } |
1623 | 1623 | ||
@@ -1692,7 +1692,7 @@ static void ttusb_dec_disconnect(struct usb_interface *intf) | |||
1692 | 1692 | ||
1693 | usb_set_intfdata(intf, NULL); | 1693 | usb_set_intfdata(intf, NULL); |
1694 | 1694 | ||
1695 | dprintk("%s\n", __FUNCTION__); | 1695 | dprintk("%s\n", __func__); |
1696 | 1696 | ||
1697 | if (dec->active) { | 1697 | if (dec->active) { |
1698 | ttusb_dec_exit_tasklet(dec); | 1698 | ttusb_dec_exit_tasklet(dec); |
@@ -1749,7 +1749,7 @@ static int __init ttusb_dec_init(void) | |||
1749 | int result; | 1749 | int result; |
1750 | 1750 | ||
1751 | if ((result = usb_register(&ttusb_dec_driver)) < 0) { | 1751 | if ((result = usb_register(&ttusb_dec_driver)) < 0) { |
1752 | printk("%s: initialisation failed: error %d.\n", __FUNCTION__, | 1752 | printk("%s: initialisation failed: error %d.\n", __func__, |
1753 | result); | 1753 | result); |
1754 | return result; | 1754 | return result; |
1755 | } | 1755 | } |
diff --git a/drivers/media/dvb/ttusb-dec/ttusbdecfe.c b/drivers/media/dvb/ttusb-dec/ttusbdecfe.c index a6fb1d6a7b5..eb5eaeccd7c 100644 --- a/drivers/media/dvb/ttusb-dec/ttusbdecfe.c +++ b/drivers/media/dvb/ttusb-dec/ttusbdecfe.c | |||
@@ -53,7 +53,7 @@ static int ttusbdecfe_read_status(struct dvb_frontend* fe, fe_status_t* status) | |||
53 | return ret; | 53 | return ret; |
54 | 54 | ||
55 | if(len != 4) { | 55 | if(len != 4) { |
56 | printk(KERN_ERR "%s: unexpected reply\n", __FUNCTION__); | 56 | printk(KERN_ERR "%s: unexpected reply\n", __func__); |
57 | return -EIO; | 57 | return -EIO; |
58 | } | 58 | } |
59 | 59 | ||
@@ -70,7 +70,7 @@ static int ttusbdecfe_read_status(struct dvb_frontend* fe, fe_status_t* status) | |||
70 | break; | 70 | break; |
71 | default: | 71 | default: |
72 | pr_info("%s: returned unknown value: %d\n", | 72 | pr_info("%s: returned unknown value: %d\n", |
73 | __FUNCTION__, result[3]); | 73 | __func__, result[3]); |
74 | return -EIO; | 74 | return -EIO; |
75 | } | 75 | } |
76 | 76 | ||