aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorMike Isely <isely@pobox.com>2008-04-09 04:44:57 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-04-24 13:09:49 -0400
commit49844c291a02a8630215f779fa44b3198d0a4f5b (patch)
tree1867eebb439f995da1f2c261d3355a8af2775f6c /drivers/media
parent18ecbb4771eb0ecf297e996966b3c42f69cd6c02 (diff)
V4L/DVB (7715): pvrusb2: Clean out all use of __FUNCTION__
Apparently the kernel developers no longer consider it proper etiquette to use __FUNCTION__; everyone must instead use __func__ (even though it breaks with older compilers). And worse still, actual effort is being expended to sweep this change throughout the kernel source tree. Don't these people have better things to do? So... Completely clean out all use of __FUNCTION__ from the pvrusb2 driver (it was just in the sysfs interface). I'm not going to use __func__ either. So there. Signed-off-by: Mike Isely <isely@pobox.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/pvrusb2/pvrusb2-sysfs.c49
1 files changed, 29 insertions, 20 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-sysfs.c b/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
index 78ecfcbdd0b9..0ff7a836a8a2 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
@@ -608,8 +608,9 @@ static void pvr2_sysfs_add_control(struct pvr2_sysfs *sfp,int ctl_id)
608 608
609 ret = sysfs_create_group(&sfp->class_dev->kobj,&cip->grp); 609 ret = sysfs_create_group(&sfp->class_dev->kobj,&cip->grp);
610 if (ret) { 610 if (ret) {
611 printk(KERN_WARNING "%s: sysfs_create_group error: %d\n", 611 pvr2_trace(PVR2_TRACE_ERROR_LEGS,
612 __FUNCTION__, ret); 612 "sysfs_create_group error: %d",
613 ret);
613 return; 614 return;
614 } 615 }
615 cip->created_ok = !0; 616 cip->created_ok = !0;
@@ -640,15 +641,17 @@ static void pvr2_sysfs_add_debugifc(struct pvr2_sysfs *sfp)
640 sfp->debugifc = dip; 641 sfp->debugifc = dip;
641 ret = device_create_file(sfp->class_dev,&dip->attr_debugcmd); 642 ret = device_create_file(sfp->class_dev,&dip->attr_debugcmd);
642 if (ret < 0) { 643 if (ret < 0) {
643 printk(KERN_WARNING "%s: device_create_file error: %d\n", 644 pvr2_trace(PVR2_TRACE_ERROR_LEGS,
644 __FUNCTION__, ret); 645 "device_create_file error: %d",
646 ret);
645 } else { 647 } else {
646 dip->debugcmd_created_ok = !0; 648 dip->debugcmd_created_ok = !0;
647 } 649 }
648 ret = device_create_file(sfp->class_dev,&dip->attr_debuginfo); 650 ret = device_create_file(sfp->class_dev,&dip->attr_debuginfo);
649 if (ret < 0) { 651 if (ret < 0) {
650 printk(KERN_WARNING "%s: device_create_file error: %d\n", 652 pvr2_trace(PVR2_TRACE_ERROR_LEGS,
651 __FUNCTION__, ret); 653 "device_create_file error: %d",
654 ret);
652 } else { 655 } else {
653 dip->debuginfo_created_ok = !0; 656 dip->debuginfo_created_ok = !0;
654 } 657 }
@@ -851,8 +854,8 @@ static void class_dev_create(struct pvr2_sysfs *sfp,
851 class_dev->driver_data = sfp; 854 class_dev->driver_data = sfp;
852 ret = device_register(class_dev); 855 ret = device_register(class_dev);
853 if (ret) { 856 if (ret) {
854 printk(KERN_ERR "%s: device_register failed\n", 857 pvr2_trace(PVR2_TRACE_ERROR_LEGS,
855 __FUNCTION__); 858 "device_register failed");
856 kfree(class_dev); 859 kfree(class_dev);
857 return; 860 return;
858 } 861 }
@@ -864,8 +867,9 @@ static void class_dev_create(struct pvr2_sysfs *sfp,
864 ret = device_create_file(sfp->class_dev, 867 ret = device_create_file(sfp->class_dev,
865 &sfp->attr_v4l_minor_number); 868 &sfp->attr_v4l_minor_number);
866 if (ret < 0) { 869 if (ret < 0) {
867 printk(KERN_WARNING "%s: device_create_file error: %d\n", 870 pvr2_trace(PVR2_TRACE_ERROR_LEGS,
868 __FUNCTION__, ret); 871 "device_create_file error: %d",
872 ret);
869 } else { 873 } else {
870 sfp->v4l_minor_number_created_ok = !0; 874 sfp->v4l_minor_number_created_ok = !0;
871 } 875 }
@@ -877,8 +881,9 @@ static void class_dev_create(struct pvr2_sysfs *sfp,
877 ret = device_create_file(sfp->class_dev, 881 ret = device_create_file(sfp->class_dev,
878 &sfp->attr_v4l_radio_minor_number); 882 &sfp->attr_v4l_radio_minor_number);
879 if (ret < 0) { 883 if (ret < 0) {
880 printk(KERN_WARNING "%s: device_create_file error: %d\n", 884 pvr2_trace(PVR2_TRACE_ERROR_LEGS,
881 __FUNCTION__, ret); 885 "device_create_file error: %d",
886 ret);
882 } else { 887 } else {
883 sfp->v4l_radio_minor_number_created_ok = !0; 888 sfp->v4l_radio_minor_number_created_ok = !0;
884 } 889 }
@@ -889,8 +894,9 @@ static void class_dev_create(struct pvr2_sysfs *sfp,
889 sfp->attr_unit_number.store = NULL; 894 sfp->attr_unit_number.store = NULL;
890 ret = device_create_file(sfp->class_dev,&sfp->attr_unit_number); 895 ret = device_create_file(sfp->class_dev,&sfp->attr_unit_number);
891 if (ret < 0) { 896 if (ret < 0) {
892 printk(KERN_WARNING "%s: device_create_file error: %d\n", 897 pvr2_trace(PVR2_TRACE_ERROR_LEGS,
893 __FUNCTION__, ret); 898 "device_create_file error: %d",
899 ret);
894 } else { 900 } else {
895 sfp->unit_number_created_ok = !0; 901 sfp->unit_number_created_ok = !0;
896 } 902 }
@@ -902,8 +908,9 @@ static void class_dev_create(struct pvr2_sysfs *sfp,
902 ret = device_create_file(sfp->class_dev, 908 ret = device_create_file(sfp->class_dev,
903 &sfp->attr_bus_info); 909 &sfp->attr_bus_info);
904 if (ret < 0) { 910 if (ret < 0) {
905 printk(KERN_WARNING "%s: device_create_file error: %d\n", 911 pvr2_trace(PVR2_TRACE_ERROR_LEGS,
906 __FUNCTION__, ret); 912 "device_create_file error: %d",
913 ret);
907 } else { 914 } else {
908 sfp->bus_info_created_ok = !0; 915 sfp->bus_info_created_ok = !0;
909 } 916 }
@@ -915,8 +922,9 @@ static void class_dev_create(struct pvr2_sysfs *sfp,
915 ret = device_create_file(sfp->class_dev, 922 ret = device_create_file(sfp->class_dev,
916 &sfp->attr_hdw_name); 923 &sfp->attr_hdw_name);
917 if (ret < 0) { 924 if (ret < 0) {
918 printk(KERN_WARNING "%s: device_create_file error: %d\n", 925 pvr2_trace(PVR2_TRACE_ERROR_LEGS,
919 __FUNCTION__, ret); 926 "device_create_file error: %d",
927 ret);
920 } else { 928 } else {
921 sfp->hdw_name_created_ok = !0; 929 sfp->hdw_name_created_ok = !0;
922 } 930 }
@@ -928,8 +936,9 @@ static void class_dev_create(struct pvr2_sysfs *sfp,
928 ret = device_create_file(sfp->class_dev, 936 ret = device_create_file(sfp->class_dev,
929 &sfp->attr_hdw_desc); 937 &sfp->attr_hdw_desc);
930 if (ret < 0) { 938 if (ret < 0) {
931 printk(KERN_WARNING "%s: device_create_file error: %d\n", 939 pvr2_trace(PVR2_TRACE_ERROR_LEGS,
932 __FUNCTION__, ret); 940 "device_create_file error: %d",
941 ret);
933 } else { 942 } else {
934 sfp->hdw_desc_created_ok = !0; 943 sfp->hdw_desc_created_ok = !0;
935 } 944 }