diff options
author | Michael Krufky <mkrufky@linuxtv.org> | 2008-05-22 17:30:17 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-20 06:20:51 -0400 |
commit | 18658117ff844e8117f6b363cb7fa8c5f8ad2cb8 (patch) | |
tree | 0588a927374c7d5ed4d4bff117dd5203ef54342a | |
parent | 854470606070d91955f03a7dca3a8024fc2a2540 (diff) |
V4L/DVB (8273): sms1xxx: replace __FUNCTION__ with __func__
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r-- | drivers/media/dvb/siano/smscoreapi.c | 56 | ||||
-rw-r--r-- | drivers/media/dvb/siano/smsdvb.c | 24 | ||||
-rw-r--r-- | drivers/media/dvb/siano/smsusb.c | 40 |
3 files changed, 60 insertions, 60 deletions
diff --git a/drivers/media/dvb/siano/smscoreapi.c b/drivers/media/dvb/siano/smscoreapi.c index d3ba1fcde54a..e55138e6627a 100644 --- a/drivers/media/dvb/siano/smscoreapi.c +++ b/drivers/media/dvb/siano/smscoreapi.c | |||
@@ -285,7 +285,7 @@ smscore_buffer_t *smscore_createbuffer(u8* buffer, void* common_buffer, dma_addr | |||
285 | smscore_buffer_t *cb = kmalloc(sizeof(smscore_buffer_t), GFP_KERNEL); | 285 | smscore_buffer_t *cb = kmalloc(sizeof(smscore_buffer_t), GFP_KERNEL); |
286 | if (!cb) | 286 | if (!cb) |
287 | { | 287 | { |
288 | printk(KERN_INFO "%s kmalloc(...) failed\n", __FUNCTION__); | 288 | printk(KERN_INFO "%s kmalloc(...) failed\n", __func__); |
289 | return NULL; | 289 | return NULL; |
290 | } | 290 | } |
291 | 291 | ||
@@ -313,7 +313,7 @@ int smscore_register_device(smsdevice_params_t *params, smscore_device_t **cored | |||
313 | dev = kzalloc(sizeof(smscore_device_t), GFP_KERNEL); | 313 | dev = kzalloc(sizeof(smscore_device_t), GFP_KERNEL); |
314 | if (!dev) | 314 | if (!dev) |
315 | { | 315 | { |
316 | printk(KERN_INFO "%s kzalloc(...) failed\n", __FUNCTION__); | 316 | printk(KERN_INFO "%s kzalloc(...) failed\n", __func__); |
317 | return -ENOMEM; | 317 | return -ENOMEM; |
318 | } | 318 | } |
319 | 319 | ||
@@ -359,7 +359,7 @@ int smscore_register_device(smsdevice_params_t *params, smscore_device_t **cored | |||
359 | smscore_putbuffer(dev, cb); | 359 | smscore_putbuffer(dev, cb); |
360 | } | 360 | } |
361 | 361 | ||
362 | printk(KERN_INFO "%s allocated %d buffers\n", __FUNCTION__, dev->num_buffers); | 362 | printk(KERN_INFO "%s allocated %d buffers\n", __func__, dev->num_buffers); |
363 | 363 | ||
364 | dev->mode = DEVICE_MODE_NONE; | 364 | dev->mode = DEVICE_MODE_NONE; |
365 | dev->context = params->context; | 365 | dev->context = params->context; |
@@ -380,7 +380,7 @@ int smscore_register_device(smsdevice_params_t *params, smscore_device_t **cored | |||
380 | 380 | ||
381 | *coredev = dev; | 381 | *coredev = dev; |
382 | 382 | ||
383 | printk(KERN_INFO "%s device %p created\n", __FUNCTION__, dev); | 383 | printk(KERN_INFO "%s device %p created\n", __func__, dev); |
384 | 384 | ||
385 | return 0; | 385 | return 0; |
386 | } | 386 | } |
@@ -402,7 +402,7 @@ int smscore_start_device(smscore_device_t *coredev) | |||
402 | 402 | ||
403 | rc = smscore_notify_callbacks(coredev, coredev->device, 1); | 403 | rc = smscore_notify_callbacks(coredev, coredev->device, 1); |
404 | 404 | ||
405 | printk(KERN_INFO "%s device %p started, rc %d\n", __FUNCTION__, coredev, rc); | 405 | printk(KERN_INFO "%s device %p started, rc %d\n", __func__, coredev, rc); |
406 | 406 | ||
407 | kmutex_unlock(&g_smscore_deviceslock); | 407 | kmutex_unlock(&g_smscore_deviceslock); |
408 | 408 | ||
@@ -526,7 +526,7 @@ int smscore_load_firmware(smscore_device_t *coredev, char* filename, loadfirmwar | |||
526 | rc = request_firmware(&fw, filename, coredev->device); | 526 | rc = request_firmware(&fw, filename, coredev->device); |
527 | if (rc < 0) | 527 | if (rc < 0) |
528 | { | 528 | { |
529 | printk(KERN_INFO "%s failed to open \"%s\"\n", __FUNCTION__, filename); | 529 | printk(KERN_INFO "%s failed to open \"%s\"\n", __func__, filename); |
530 | return rc; | 530 | return rc; |
531 | } | 531 | } |
532 | 532 | ||
@@ -543,7 +543,7 @@ int smscore_load_firmware(smscore_device_t *coredev, char* filename, loadfirmwar | |||
543 | } | 543 | } |
544 | else | 544 | else |
545 | { | 545 | { |
546 | printk(KERN_INFO "%s failed to allocate firmware buffer\n", __FUNCTION__); | 546 | printk(KERN_INFO "%s failed to allocate firmware buffer\n", __func__); |
547 | rc = -ENOMEM; | 547 | rc = -ENOMEM; |
548 | } | 548 | } |
549 | 549 | ||
@@ -583,11 +583,11 @@ void smscore_unregister_device(smscore_device_t *coredev) | |||
583 | if (num_buffers == coredev->num_buffers) | 583 | if (num_buffers == coredev->num_buffers) |
584 | break; | 584 | break; |
585 | 585 | ||
586 | printk(KERN_INFO "%s waiting for %d buffer(s)\n", __FUNCTION__, coredev->num_buffers - num_buffers); | 586 | printk(KERN_INFO "%s waiting for %d buffer(s)\n", __func__, coredev->num_buffers - num_buffers); |
587 | msleep(100); | 587 | msleep(100); |
588 | } | 588 | } |
589 | 589 | ||
590 | printk(KERN_INFO "%s freed %d buffers\n", __FUNCTION__, num_buffers); | 590 | printk(KERN_INFO "%s freed %d buffers\n", __func__, num_buffers); |
591 | 591 | ||
592 | if (coredev->common_buffer) | 592 | if (coredev->common_buffer) |
593 | dma_free_coherent(NULL, coredev->common_buffer_size, coredev->common_buffer, coredev->common_buffer_phys); | 593 | dma_free_coherent(NULL, coredev->common_buffer_size, coredev->common_buffer, coredev->common_buffer_phys); |
@@ -597,7 +597,7 @@ void smscore_unregister_device(smscore_device_t *coredev) | |||
597 | 597 | ||
598 | kmutex_unlock(&g_smscore_deviceslock); | 598 | kmutex_unlock(&g_smscore_deviceslock); |
599 | 599 | ||
600 | printk(KERN_INFO "%s device %p destroyed\n", __FUNCTION__, coredev); | 600 | printk(KERN_INFO "%s device %p destroyed\n", __func__, coredev); |
601 | } | 601 | } |
602 | 602 | ||
603 | int smscore_detect_mode(smscore_device_t *coredev) | 603 | int smscore_detect_mode(smscore_device_t *coredev) |
@@ -614,14 +614,14 @@ int smscore_detect_mode(smscore_device_t *coredev) | |||
614 | rc = smscore_sendrequest_and_wait(coredev, msg, msg->msgLength, &coredev->version_ex_done); | 614 | rc = smscore_sendrequest_and_wait(coredev, msg, msg->msgLength, &coredev->version_ex_done); |
615 | if (rc == -ETIME) | 615 | if (rc == -ETIME) |
616 | { | 616 | { |
617 | printk("%s: MSG_SMS_GET_VERSION_EX_REQ failed first try\n", __FUNCTION__); | 617 | printk("%s: MSG_SMS_GET_VERSION_EX_REQ failed first try\n", __func__); |
618 | 618 | ||
619 | if (wait_for_completion_timeout(&coredev->resume_done, msecs_to_jiffies(5000))) | 619 | if (wait_for_completion_timeout(&coredev->resume_done, msecs_to_jiffies(5000))) |
620 | { | 620 | { |
621 | rc = smscore_sendrequest_and_wait(coredev, msg, msg->msgLength, &coredev->version_ex_done); | 621 | rc = smscore_sendrequest_and_wait(coredev, msg, msg->msgLength, &coredev->version_ex_done); |
622 | if (rc < 0) | 622 | if (rc < 0) |
623 | { | 623 | { |
624 | printk("%s: MSG_SMS_GET_VERSION_EX_REQ failed second try, rc %d\n", __FUNCTION__, rc); | 624 | printk("%s: MSG_SMS_GET_VERSION_EX_REQ failed second try, rc %d\n", __func__, rc); |
625 | } | 625 | } |
626 | } | 626 | } |
627 | else | 627 | else |
@@ -664,7 +664,7 @@ int smscore_set_device_mode(smscore_device_t *coredev, int mode) | |||
664 | { | 664 | { |
665 | if (mode < DEVICE_MODE_DVBT || mode > DEVICE_MODE_RAW_TUNER) | 665 | if (mode < DEVICE_MODE_DVBT || mode > DEVICE_MODE_RAW_TUNER) |
666 | { | 666 | { |
667 | printk(KERN_INFO "%s invalid mode specified %d\n", __FUNCTION__, mode); | 667 | printk(KERN_INFO "%s invalid mode specified %d\n", __func__, mode); |
668 | return -EINVAL; | 668 | return -EINVAL; |
669 | } | 669 | } |
670 | 670 | ||
@@ -677,7 +677,7 @@ int smscore_set_device_mode(smscore_device_t *coredev, int mode) | |||
677 | 677 | ||
678 | if (coredev->mode == mode) | 678 | if (coredev->mode == mode) |
679 | { | 679 | { |
680 | printk(KERN_INFO "%s device mode %d already set\n", __FUNCTION__, mode); | 680 | printk(KERN_INFO "%s device mode %d already set\n", __func__, mode); |
681 | return 0; | 681 | return 0; |
682 | } | 682 | } |
683 | 683 | ||
@@ -689,7 +689,7 @@ int smscore_set_device_mode(smscore_device_t *coredev, int mode) | |||
689 | } | 689 | } |
690 | else | 690 | else |
691 | { | 691 | { |
692 | printk(KERN_INFO "%s mode %d supported by running firmware\n", __FUNCTION__, mode); | 692 | printk(KERN_INFO "%s mode %d supported by running firmware\n", __func__, mode); |
693 | } | 693 | } |
694 | 694 | ||
695 | buffer = kmalloc(sizeof(SmsMsgData_ST) + SMS_DMA_ALIGNMENT, GFP_KERNEL | GFP_DMA); | 695 | buffer = kmalloc(sizeof(SmsMsgData_ST) + SMS_DMA_ALIGNMENT, GFP_KERNEL | GFP_DMA); |
@@ -834,7 +834,7 @@ void smscore_onresponse(smscore_device_t *coredev, smscore_buffer_t *cb) | |||
834 | case MSG_SMS_GET_VERSION_EX_RES: | 834 | case MSG_SMS_GET_VERSION_EX_RES: |
835 | { | 835 | { |
836 | SmsVersionRes_ST *ver = (SmsVersionRes_ST*) phdr; | 836 | SmsVersionRes_ST *ver = (SmsVersionRes_ST*) phdr; |
837 | printk("%s: MSG_SMS_GET_VERSION_EX_RES id %d prots 0x%x ver %d.%d\n", __FUNCTION__, ver->FirmwareId, ver->SupportedProtocols, ver->RomVersionMajor, ver->RomVersionMinor); | 837 | printk("%s: MSG_SMS_GET_VERSION_EX_RES id %d prots 0x%x ver %d.%d\n", __func__, ver->FirmwareId, ver->SupportedProtocols, ver->RomVersionMajor, ver->RomVersionMinor); |
838 | 838 | ||
839 | coredev->mode = ver->FirmwareId == 255 ? DEVICE_MODE_NONE : ver->FirmwareId; | 839 | coredev->mode = ver->FirmwareId == 255 ? DEVICE_MODE_NONE : ver->FirmwareId; |
840 | coredev->modes_supported = ver->SupportedProtocols; | 840 | coredev->modes_supported = ver->SupportedProtocols; |
@@ -844,12 +844,12 @@ void smscore_onresponse(smscore_device_t *coredev, smscore_buffer_t *cb) | |||
844 | } | 844 | } |
845 | 845 | ||
846 | case MSG_SMS_INIT_DEVICE_RES: | 846 | case MSG_SMS_INIT_DEVICE_RES: |
847 | printk("%s: MSG_SMS_INIT_DEVICE_RES\n", __FUNCTION__); | 847 | printk("%s: MSG_SMS_INIT_DEVICE_RES\n", __func__); |
848 | complete(&coredev->init_device_done); | 848 | complete(&coredev->init_device_done); |
849 | break; | 849 | break; |
850 | 850 | ||
851 | case MSG_SW_RELOAD_START_RES: | 851 | case MSG_SW_RELOAD_START_RES: |
852 | printk("%s: MSG_SW_RELOAD_START_RES\n", __FUNCTION__); | 852 | printk("%s: MSG_SW_RELOAD_START_RES\n", __func__); |
853 | complete(&coredev->reload_start_done); | 853 | complete(&coredev->reload_start_done); |
854 | break; | 854 | break; |
855 | 855 | ||
@@ -858,11 +858,11 @@ void smscore_onresponse(smscore_device_t *coredev, smscore_buffer_t *cb) | |||
858 | break; | 858 | break; |
859 | 859 | ||
860 | case MSG_SW_RELOAD_EXEC_RES: | 860 | case MSG_SW_RELOAD_EXEC_RES: |
861 | printk("%s: MSG_SW_RELOAD_EXEC_RES\n", __FUNCTION__); | 861 | printk("%s: MSG_SW_RELOAD_EXEC_RES\n", __func__); |
862 | break; | 862 | break; |
863 | 863 | ||
864 | case MSG_SMS_SWDOWNLOAD_TRIGGER_RES: | 864 | case MSG_SMS_SWDOWNLOAD_TRIGGER_RES: |
865 | printk("%s: MSG_SMS_SWDOWNLOAD_TRIGGER_RES\n", __FUNCTION__); | 865 | printk("%s: MSG_SMS_SWDOWNLOAD_TRIGGER_RES\n", __func__); |
866 | complete(&coredev->trigger_done); | 866 | complete(&coredev->trigger_done); |
867 | break; | 867 | break; |
868 | 868 | ||
@@ -871,7 +871,7 @@ void smscore_onresponse(smscore_device_t *coredev, smscore_buffer_t *cb) | |||
871 | break; | 871 | break; |
872 | 872 | ||
873 | default: | 873 | default: |
874 | printk(KERN_INFO "%s no client (%p) or error (%d), type:%d dstid:%d\n", __FUNCTION__, client, rc, phdr->msgType, phdr->msgDstId); | 874 | printk(KERN_INFO "%s no client (%p) or error (%d), type:%d dstid:%d\n", __func__, client, rc, phdr->msgType, phdr->msgDstId); |
875 | } | 875 | } |
876 | 876 | ||
877 | smscore_putbuffer(coredev, cb); | 877 | smscore_putbuffer(coredev, cb); |
@@ -986,7 +986,7 @@ int smscore_register_client(smscore_device_t *coredev, smsclient_params_t *param | |||
986 | 986 | ||
987 | *client = newclient; | 987 | *client = newclient; |
988 | 988 | ||
989 | printk(KERN_INFO "%s %p %d %d\n", __FUNCTION__, params->context, params->data_type, params->initial_id); | 989 | printk(KERN_INFO "%s %p %d %d\n", __func__, params->context, params->data_type, params->initial_id); |
990 | 990 | ||
991 | return 0; | 991 | return 0; |
992 | } | 992 | } |
@@ -1019,7 +1019,7 @@ void smscore_unregister_client(smscore_client_t *client) | |||
1019 | } | 1019 | } |
1020 | } | 1020 | } |
1021 | 1021 | ||
1022 | printk(KERN_INFO "%s %p %d\n", __FUNCTION__, client->context, client->data_type); | 1022 | printk(KERN_INFO "%s %p %d\n", __func__, client->context, client->data_type); |
1023 | 1023 | ||
1024 | list_del(&client->entry); | 1024 | list_del(&client->entry); |
1025 | kfree(client); | 1025 | kfree(client); |
@@ -1076,19 +1076,19 @@ int smscore_map_common_buffer(smscore_device_t *coredev, struct vm_area_struct * | |||
1076 | 1076 | ||
1077 | if (!(vma->vm_flags & (VM_READ | VM_SHARED)) || (vma->vm_flags & VM_WRITE)) | 1077 | if (!(vma->vm_flags & (VM_READ | VM_SHARED)) || (vma->vm_flags & VM_WRITE)) |
1078 | { | 1078 | { |
1079 | printk(KERN_INFO "%s invalid vm flags\n", __FUNCTION__); | 1079 | printk(KERN_INFO "%s invalid vm flags\n", __func__); |
1080 | return -EINVAL; | 1080 | return -EINVAL; |
1081 | } | 1081 | } |
1082 | 1082 | ||
1083 | if ((end - start) != size) | 1083 | if ((end - start) != size) |
1084 | { | 1084 | { |
1085 | printk(KERN_INFO "%s invalid size %d expected %d\n", __FUNCTION__, (int)(end - start), (int) size); | 1085 | printk(KERN_INFO "%s invalid size %d expected %d\n", __func__, (int)(end - start), (int) size); |
1086 | return -EINVAL; | 1086 | return -EINVAL; |
1087 | } | 1087 | } |
1088 | 1088 | ||
1089 | if (remap_pfn_range(vma, start, coredev->common_buffer_phys >> PAGE_SHIFT, size, pgprot_noncached(vma->vm_page_prot))) | 1089 | if (remap_pfn_range(vma, start, coredev->common_buffer_phys >> PAGE_SHIFT, size, pgprot_noncached(vma->vm_page_prot))) |
1090 | { | 1090 | { |
1091 | printk(KERN_INFO "%s remap_page_range failed\n", __FUNCTION__); | 1091 | printk(KERN_INFO "%s remap_page_range failed\n", __func__); |
1092 | return -EAGAIN; | 1092 | return -EAGAIN; |
1093 | } | 1093 | } |
1094 | 1094 | ||
@@ -1112,7 +1112,7 @@ int smscore_module_init(void) | |||
1112 | /* DVB Register */ | 1112 | /* DVB Register */ |
1113 | rc = smsdvb_register(); | 1113 | rc = smsdvb_register(); |
1114 | 1114 | ||
1115 | printk(KERN_INFO "%s, rc %d\n", __FUNCTION__, rc); | 1115 | printk(KERN_INFO "%s, rc %d\n", __func__, rc); |
1116 | 1116 | ||
1117 | return rc; | 1117 | return rc; |
1118 | } | 1118 | } |
@@ -1146,7 +1146,7 @@ void smscore_module_exit(void) | |||
1146 | /* Unregister USB */ | 1146 | /* Unregister USB */ |
1147 | smsusb_unregister(); | 1147 | smsusb_unregister(); |
1148 | 1148 | ||
1149 | printk(KERN_INFO "%s\n", __FUNCTION__); | 1149 | printk(KERN_INFO "%s\n", __func__); |
1150 | } | 1150 | } |
1151 | 1151 | ||
1152 | module_init(smscore_module_init); | 1152 | module_init(smscore_module_init); |
diff --git a/drivers/media/dvb/siano/smsdvb.c b/drivers/media/dvb/siano/smsdvb.c index e1a14a812c25..1a75033c35de 100644 --- a/drivers/media/dvb/siano/smsdvb.c +++ b/drivers/media/dvb/siano/smsdvb.c | |||
@@ -107,7 +107,7 @@ static int smsdvb_start_feed(struct dvb_demux_feed *feed) | |||
107 | smsdvb_client_t *client = container_of(feed->demux, smsdvb_client_t, demux); | 107 | smsdvb_client_t *client = container_of(feed->demux, smsdvb_client_t, demux); |
108 | SmsMsgData_ST PidMsg; | 108 | SmsMsgData_ST PidMsg; |
109 | 109 | ||
110 | printk("%s add pid %d(%x)\n", __FUNCTION__, feed->pid, feed->pid); | 110 | printk("%s add pid %d(%x)\n", __func__, feed->pid, feed->pid); |
111 | 111 | ||
112 | PidMsg.xMsgHeader.msgSrcId = DVBT_BDA_CONTROL_MSG_ID; | 112 | PidMsg.xMsgHeader.msgSrcId = DVBT_BDA_CONTROL_MSG_ID; |
113 | PidMsg.xMsgHeader.msgDstId = HIF_TASK; | 113 | PidMsg.xMsgHeader.msgDstId = HIF_TASK; |
@@ -124,7 +124,7 @@ static int smsdvb_stop_feed(struct dvb_demux_feed *feed) | |||
124 | smsdvb_client_t *client = container_of(feed->demux, smsdvb_client_t, demux); | 124 | smsdvb_client_t *client = container_of(feed->demux, smsdvb_client_t, demux); |
125 | SmsMsgData_ST PidMsg; | 125 | SmsMsgData_ST PidMsg; |
126 | 126 | ||
127 | printk("%s remove pid %d(%x)\n", __FUNCTION__, feed->pid, feed->pid); | 127 | printk("%s remove pid %d(%x)\n", __func__, feed->pid, feed->pid); |
128 | 128 | ||
129 | PidMsg.xMsgHeader.msgSrcId = DVBT_BDA_CONTROL_MSG_ID; | 129 | PidMsg.xMsgHeader.msgSrcId = DVBT_BDA_CONTROL_MSG_ID; |
130 | PidMsg.xMsgHeader.msgDstId = HIF_TASK; | 130 | PidMsg.xMsgHeader.msgDstId = HIF_TASK; |
@@ -197,7 +197,7 @@ static int smsdvb_read_snr(struct dvb_frontend *fe, u16 *snr) | |||
197 | 197 | ||
198 | static int smsdvb_get_tune_settings(struct dvb_frontend *fe, struct dvb_frontend_tune_settings *tune) | 198 | static int smsdvb_get_tune_settings(struct dvb_frontend *fe, struct dvb_frontend_tune_settings *tune) |
199 | { | 199 | { |
200 | printk("%s\n", __FUNCTION__); | 200 | printk("%s\n", __func__); |
201 | 201 | ||
202 | tune->min_delay_ms = 400; | 202 | tune->min_delay_ms = 400; |
203 | tune->step_size = 250000; | 203 | tune->step_size = 250000; |
@@ -223,7 +223,7 @@ static int smsdvb_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_para | |||
223 | Msg.Data[0] = fep->frequency; | 223 | Msg.Data[0] = fep->frequency; |
224 | Msg.Data[2] = 12000000; | 224 | Msg.Data[2] = 12000000; |
225 | 225 | ||
226 | printk("%s freq %d band %d\n", __FUNCTION__, fep->frequency, fep->u.ofdm.bandwidth); | 226 | printk("%s freq %d band %d\n", __func__, fep->frequency, fep->u.ofdm.bandwidth); |
227 | 227 | ||
228 | switch(fep->u.ofdm.bandwidth) | 228 | switch(fep->u.ofdm.bandwidth) |
229 | { | 229 | { |
@@ -242,7 +242,7 @@ static int smsdvb_get_frontend(struct dvb_frontend *fe, struct dvb_frontend_para | |||
242 | { | 242 | { |
243 | smsdvb_client_t *client = container_of(fe, smsdvb_client_t, frontend); | 243 | smsdvb_client_t *client = container_of(fe, smsdvb_client_t, frontend); |
244 | 244 | ||
245 | printk("%s\n", __FUNCTION__); | 245 | printk("%s\n", __func__); |
246 | 246 | ||
247 | // todo: | 247 | // todo: |
248 | memcpy(fep, &client->fe_params, sizeof(struct dvb_frontend_parameters)); | 248 | memcpy(fep, &client->fe_params, sizeof(struct dvb_frontend_parameters)); |
@@ -303,7 +303,7 @@ int smsdvb_hotplug(smscore_device_t *coredev, struct device* device, int arrival | |||
303 | client = kzalloc(sizeof(smsdvb_client_t), GFP_KERNEL); | 303 | client = kzalloc(sizeof(smsdvb_client_t), GFP_KERNEL); |
304 | if (!client) | 304 | if (!client) |
305 | { | 305 | { |
306 | printk(KERN_INFO "%s kmalloc() failed\n", __FUNCTION__); | 306 | printk(KERN_INFO "%s kmalloc() failed\n", __func__); |
307 | return -ENOMEM; | 307 | return -ENOMEM; |
308 | } | 308 | } |
309 | 309 | ||
@@ -325,7 +325,7 @@ int smsdvb_hotplug(smscore_device_t *coredev, struct device* device, int arrival | |||
325 | rc = dvb_dmx_init(&client->demux); | 325 | rc = dvb_dmx_init(&client->demux); |
326 | if (rc < 0) | 326 | if (rc < 0) |
327 | { | 327 | { |
328 | printk("%s dvb_dmx_init failed %d\n\n", __FUNCTION__, rc); | 328 | printk("%s dvb_dmx_init failed %d\n\n", __func__, rc); |
329 | goto dvbdmx_error; | 329 | goto dvbdmx_error; |
330 | } | 330 | } |
331 | 331 | ||
@@ -337,7 +337,7 @@ int smsdvb_hotplug(smscore_device_t *coredev, struct device* device, int arrival | |||
337 | rc = dvb_dmxdev_init(&client->dmxdev, &client->adapter); | 337 | rc = dvb_dmxdev_init(&client->dmxdev, &client->adapter); |
338 | if (rc < 0) | 338 | if (rc < 0) |
339 | { | 339 | { |
340 | printk("%s dvb_dmxdev_init failed %d\n", __FUNCTION__, rc); | 340 | printk("%s dvb_dmxdev_init failed %d\n", __func__, rc); |
341 | goto dmxdev_error; | 341 | goto dmxdev_error; |
342 | } | 342 | } |
343 | 343 | ||
@@ -347,7 +347,7 @@ int smsdvb_hotplug(smscore_device_t *coredev, struct device* device, int arrival | |||
347 | rc = dvb_register_frontend(&client->adapter, &client->frontend); | 347 | rc = dvb_register_frontend(&client->adapter, &client->frontend); |
348 | if (rc < 0) | 348 | if (rc < 0) |
349 | { | 349 | { |
350 | printk("%s frontend registration failed %d\n", __FUNCTION__, rc); | 350 | printk("%s frontend registration failed %d\n", __func__, rc); |
351 | goto frontend_error; | 351 | goto frontend_error; |
352 | } | 352 | } |
353 | 353 | ||
@@ -360,7 +360,7 @@ int smsdvb_hotplug(smscore_device_t *coredev, struct device* device, int arrival | |||
360 | rc = smscore_register_client(coredev, ¶ms, &client->smsclient); | 360 | rc = smscore_register_client(coredev, ¶ms, &client->smsclient); |
361 | if (rc < 0) | 361 | if (rc < 0) |
362 | { | 362 | { |
363 | printk(KERN_INFO "%s smscore_register_client() failed %d\n", __FUNCTION__, rc); | 363 | printk(KERN_INFO "%s smscore_register_client() failed %d\n", __func__, rc); |
364 | goto client_error; | 364 | goto client_error; |
365 | } | 365 | } |
366 | 366 | ||
@@ -375,7 +375,7 @@ int smsdvb_hotplug(smscore_device_t *coredev, struct device* device, int arrival | |||
375 | 375 | ||
376 | kmutex_unlock(&g_smsdvb_clientslock); | 376 | kmutex_unlock(&g_smsdvb_clientslock); |
377 | 377 | ||
378 | printk(KERN_INFO "%s success\n", __FUNCTION__); | 378 | printk(KERN_INFO "%s success\n", __func__); |
379 | 379 | ||
380 | return 0; | 380 | return 0; |
381 | 381 | ||
@@ -405,7 +405,7 @@ int smsdvb_register(void) | |||
405 | 405 | ||
406 | rc = smscore_register_hotplug(smsdvb_hotplug); | 406 | rc = smscore_register_hotplug(smsdvb_hotplug); |
407 | 407 | ||
408 | printk(KERN_INFO "%s\n", __FUNCTION__); | 408 | printk(KERN_INFO "%s\n", __func__); |
409 | 409 | ||
410 | return rc; | 410 | return rc; |
411 | } | 411 | } |
diff --git a/drivers/media/dvb/siano/smsusb.c b/drivers/media/dvb/siano/smsusb.c index 20aa878d9d5f..e15f0342d069 100644 --- a/drivers/media/dvb/siano/smsusb.c +++ b/drivers/media/dvb/siano/smsusb.c | |||
@@ -62,7 +62,7 @@ void smsusb_onresponse(struct urb *urb) | |||
62 | 62 | ||
63 | if (urb->status < 0) | 63 | if (urb->status < 0) |
64 | { | 64 | { |
65 | printk(KERN_INFO "%s error, urb status %d, %d bytes\n", __FUNCTION__, urb->status, urb->actual_length); | 65 | printk(KERN_INFO "%s error, urb status %d, %d bytes\n", __func__, urb->status, urb->actual_length); |
66 | return; | 66 | return; |
67 | } | 67 | } |
68 | 68 | ||
@@ -81,7 +81,7 @@ void smsusb_onresponse(struct urb *urb) | |||
81 | // sanity check | 81 | // sanity check |
82 | if (((int) phdr->msgLength + surb->cb->offset) > urb->actual_length) | 82 | if (((int) phdr->msgLength + surb->cb->offset) > urb->actual_length) |
83 | { | 83 | { |
84 | printk("%s: invalid response msglen %d offset %d size %d\n", __FUNCTION__, phdr->msgLength, surb->cb->offset, urb->actual_length); | 84 | printk("%s: invalid response msglen %d offset %d size %d\n", __func__, phdr->msgLength, surb->cb->offset, urb->actual_length); |
85 | goto exit_and_resubmit; | 85 | goto exit_and_resubmit; |
86 | } | 86 | } |
87 | 87 | ||
@@ -96,7 +96,7 @@ void smsusb_onresponse(struct urb *urb) | |||
96 | } | 96 | } |
97 | else | 97 | else |
98 | { | 98 | { |
99 | printk("%s invalid response msglen %d actual %d\n", __FUNCTION__, phdr->msgLength, urb->actual_length); | 99 | printk("%s invalid response msglen %d actual %d\n", __func__, phdr->msgLength, urb->actual_length); |
100 | } | 100 | } |
101 | } | 101 | } |
102 | 102 | ||
@@ -111,7 +111,7 @@ int smsusb_submit_urb(smsusb_device_t* dev, smsusb_urb_t* surb) | |||
111 | surb->cb = smscore_getbuffer(dev->coredev); | 111 | surb->cb = smscore_getbuffer(dev->coredev); |
112 | if (!surb->cb) | 112 | if (!surb->cb) |
113 | { | 113 | { |
114 | printk(KERN_INFO "%s smscore_getbuffer(...) returned NULL\n", __FUNCTION__); | 114 | printk(KERN_INFO "%s smscore_getbuffer(...) returned NULL\n", __func__); |
115 | return -ENOMEM; | 115 | return -ENOMEM; |
116 | } | 116 | } |
117 | } | 117 | } |
@@ -156,7 +156,7 @@ int smsusb_start_streaming(smsusb_device_t* dev) | |||
156 | rc = smsusb_submit_urb(dev, &dev->surbs[i]); | 156 | rc = smsusb_submit_urb(dev, &dev->surbs[i]); |
157 | if (rc < 0) | 157 | if (rc < 0) |
158 | { | 158 | { |
159 | printk(KERN_INFO "%s smsusb_submit_urb(...) failed\n", __FUNCTION__); | 159 | printk(KERN_INFO "%s smsusb_submit_urb(...) failed\n", __func__); |
160 | smsusb_stop_streaming(dev); | 160 | smsusb_stop_streaming(dev); |
161 | break; | 161 | break; |
162 | } | 162 | } |
@@ -190,14 +190,14 @@ int smsusb1_load_firmware(struct usb_device *udev, int id) | |||
190 | 190 | ||
191 | if (id < DEVICE_MODE_DVBT || id > DEVICE_MODE_DVBT_BDA) | 191 | if (id < DEVICE_MODE_DVBT || id > DEVICE_MODE_DVBT_BDA) |
192 | { | 192 | { |
193 | printk(KERN_INFO "%s invalid firmware id specified %d\n", __FUNCTION__, id); | 193 | printk(KERN_INFO "%s invalid firmware id specified %d\n", __func__, id); |
194 | return -EINVAL; | 194 | return -EINVAL; |
195 | } | 195 | } |
196 | 196 | ||
197 | rc = request_firmware(&fw, smsusb1_fw_lkup[id], &udev->dev); | 197 | rc = request_firmware(&fw, smsusb1_fw_lkup[id], &udev->dev); |
198 | if (rc < 0) | 198 | if (rc < 0) |
199 | { | 199 | { |
200 | printk(KERN_INFO "%s failed to open \"%s\" mode %d\n", __FUNCTION__, smsusb1_fw_lkup[id], id); | 200 | printk(KERN_INFO "%s failed to open \"%s\" mode %d\n", __func__, smsusb1_fw_lkup[id], id); |
201 | return rc; | 201 | return rc; |
202 | } | 202 | } |
203 | 203 | ||
@@ -208,7 +208,7 @@ int smsusb1_load_firmware(struct usb_device *udev, int id) | |||
208 | 208 | ||
209 | rc = usb_bulk_msg(udev, usb_sndbulkpipe(udev, 2), fw_buffer, fw->size, &dummy, 1000); | 209 | rc = usb_bulk_msg(udev, usb_sndbulkpipe(udev, 2), fw_buffer, fw->size, &dummy, 1000); |
210 | 210 | ||
211 | printk(KERN_INFO "%s: sent %d(%d) bytes, rc %d\n", __FUNCTION__, fw->size, dummy, rc); | 211 | printk(KERN_INFO "%s: sent %d(%d) bytes, rc %d\n", __func__, fw->size, dummy, rc); |
212 | 212 | ||
213 | kfree(fw_buffer); | 213 | kfree(fw_buffer); |
214 | } | 214 | } |
@@ -232,7 +232,7 @@ void smsusb1_detectmode(void *context, int *mode) | |||
232 | if (!product_string) | 232 | if (!product_string) |
233 | { | 233 | { |
234 | product_string = "none"; | 234 | product_string = "none"; |
235 | printk("%s product string not found\n", __FUNCTION__); | 235 | printk("%s product string not found\n", __func__); |
236 | } | 236 | } |
237 | else | 237 | else |
238 | { | 238 | { |
@@ -246,7 +246,7 @@ void smsusb1_detectmode(void *context, int *mode) | |||
246 | *mode = 2; | 246 | *mode = 2; |
247 | } | 247 | } |
248 | 248 | ||
249 | printk("%s: %d \"%s\"\n", __FUNCTION__, *mode, product_string); | 249 | printk("%s: %d \"%s\"\n", __func__, *mode, product_string); |
250 | } | 250 | } |
251 | 251 | ||
252 | int smsusb1_setmode(void *context, int mode) | 252 | int smsusb1_setmode(void *context, int mode) |
@@ -255,7 +255,7 @@ int smsusb1_setmode(void *context, int mode) | |||
255 | 255 | ||
256 | if (mode < DEVICE_MODE_DVBT || mode > DEVICE_MODE_DVBT_BDA) | 256 | if (mode < DEVICE_MODE_DVBT || mode > DEVICE_MODE_DVBT_BDA) |
257 | { | 257 | { |
258 | printk(KERN_INFO "%s invalid firmware id specified %d\n", __FUNCTION__, mode); | 258 | printk(KERN_INFO "%s invalid firmware id specified %d\n", __func__, mode); |
259 | return -EINVAL; | 259 | return -EINVAL; |
260 | } | 260 | } |
261 | 261 | ||
@@ -276,7 +276,7 @@ void smsusb_term_device(struct usb_interface *intf) | |||
276 | 276 | ||
277 | kfree(dev); | 277 | kfree(dev); |
278 | 278 | ||
279 | printk(KERN_INFO "%s device %p destroyed\n", __FUNCTION__, dev); | 279 | printk(KERN_INFO "%s device %p destroyed\n", __func__, dev); |
280 | } | 280 | } |
281 | 281 | ||
282 | usb_set_intfdata(intf, NULL); | 282 | usb_set_intfdata(intf, NULL); |
@@ -292,7 +292,7 @@ int smsusb_init_device(struct usb_interface *intf) | |||
292 | dev = kzalloc(sizeof(smsusb_device_t), GFP_KERNEL); | 292 | dev = kzalloc(sizeof(smsusb_device_t), GFP_KERNEL); |
293 | if (!dev) | 293 | if (!dev) |
294 | { | 294 | { |
295 | printk(KERN_INFO "%s kzalloc(sizeof(smsusb_device_t) failed\n", __FUNCTION__); | 295 | printk(KERN_INFO "%s kzalloc(sizeof(smsusb_device_t) failed\n", __func__); |
296 | return -ENOMEM; | 296 | return -ENOMEM; |
297 | } | 297 | } |
298 | 298 | ||
@@ -328,7 +328,7 @@ int smsusb_init_device(struct usb_interface *intf) | |||
328 | rc = smscore_register_device(¶ms, &dev->coredev); | 328 | rc = smscore_register_device(¶ms, &dev->coredev); |
329 | if (rc < 0) | 329 | if (rc < 0) |
330 | { | 330 | { |
331 | printk(KERN_INFO "%s smscore_register_device(...) failed, rc %d\n", __FUNCTION__, rc); | 331 | printk(KERN_INFO "%s smscore_register_device(...) failed, rc %d\n", __func__, rc); |
332 | smsusb_term_device(intf); | 332 | smsusb_term_device(intf); |
333 | return rc; | 333 | return rc; |
334 | } | 334 | } |
@@ -343,7 +343,7 @@ int smsusb_init_device(struct usb_interface *intf) | |||
343 | rc = smsusb_start_streaming(dev); | 343 | rc = smsusb_start_streaming(dev); |
344 | if (rc < 0) | 344 | if (rc < 0) |
345 | { | 345 | { |
346 | printk(KERN_INFO "%s smsusb_start_streaming(...) failed\n", __FUNCTION__); | 346 | printk(KERN_INFO "%s smsusb_start_streaming(...) failed\n", __func__); |
347 | smsusb_term_device(intf); | 347 | smsusb_term_device(intf); |
348 | return rc; | 348 | return rc; |
349 | } | 349 | } |
@@ -351,12 +351,12 @@ int smsusb_init_device(struct usb_interface *intf) | |||
351 | rc = smscore_start_device(dev->coredev); | 351 | rc = smscore_start_device(dev->coredev); |
352 | if (rc < 0) | 352 | if (rc < 0) |
353 | { | 353 | { |
354 | printk(KERN_INFO "%s smscore_start_device(...) failed\n", __FUNCTION__); | 354 | printk(KERN_INFO "%s smscore_start_device(...) failed\n", __func__); |
355 | smsusb_term_device(intf); | 355 | smsusb_term_device(intf); |
356 | return rc; | 356 | return rc; |
357 | } | 357 | } |
358 | 358 | ||
359 | printk(KERN_INFO "%s device %p created\n", __FUNCTION__, dev); | 359 | printk(KERN_INFO "%s device %p created\n", __func__, dev); |
360 | 360 | ||
361 | return rc; | 361 | return rc; |
362 | } | 362 | } |
@@ -372,7 +372,7 @@ int smsusb_probe(struct usb_interface *intf, const struct usb_device_id *id) | |||
372 | rc = usb_set_interface(udev, intf->cur_altsetting->desc.bInterfaceNumber, 0); | 372 | rc = usb_set_interface(udev, intf->cur_altsetting->desc.bInterfaceNumber, 0); |
373 | if (rc < 0) | 373 | if (rc < 0) |
374 | { | 374 | { |
375 | printk(KERN_INFO "%s usb_set_interface failed, rc %d\n", __FUNCTION__, rc); | 375 | printk(KERN_INFO "%s usb_set_interface failed, rc %d\n", __func__, rc); |
376 | return rc; | 376 | return rc; |
377 | } | 377 | } |
378 | } | 378 | } |
@@ -422,7 +422,7 @@ int smsusb_register(void) | |||
422 | if (rc) | 422 | if (rc) |
423 | printk(KERN_INFO "usb_register failed. Error number %d\n", rc); | 423 | printk(KERN_INFO "usb_register failed. Error number %d\n", rc); |
424 | 424 | ||
425 | printk(KERN_INFO "%s\n", __FUNCTION__); | 425 | printk(KERN_INFO "%s\n", __func__); |
426 | 426 | ||
427 | return rc; | 427 | return rc; |
428 | } | 428 | } |
@@ -431,6 +431,6 @@ void smsusb_unregister(void) | |||
431 | { | 431 | { |
432 | /* Regular USB Cleanup */ | 432 | /* Regular USB Cleanup */ |
433 | usb_deregister(&smsusb_driver); | 433 | usb_deregister(&smsusb_driver); |
434 | printk(KERN_INFO "%s\n", __FUNCTION__); | 434 | printk(KERN_INFO "%s\n", __func__); |
435 | } | 435 | } |
436 | 436 | ||