diff options
-rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-sysfs.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-sysfs.c b/drivers/media/video/pvrusb2/pvrusb2-sysfs.c index b20dc4421d59..7a78d6b34738 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-sysfs.c +++ b/drivers/media/video/pvrusb2/pvrusb2-sysfs.c | |||
@@ -609,9 +609,12 @@ static void pvr2_sysfs_add_control(struct pvr2_sysfs *sfp,int ctl_id) | |||
609 | } | 609 | } |
610 | 610 | ||
611 | #ifdef CONFIG_VIDEO_PVRUSB2_DEBUGIFC | 611 | #ifdef CONFIG_VIDEO_PVRUSB2_DEBUGIFC |
612 | static ssize_t debuginfo_show(struct device *,char *); | 612 | static ssize_t debuginfo_show(struct device *, struct device_attribute *, |
613 | static ssize_t debugcmd_show(struct device *,char *); | 613 | char *); |
614 | static ssize_t debugcmd_store(struct device *,const char *,size_t count); | 614 | static ssize_t debugcmd_show(struct device *, struct device_attribute *, |
615 | char *); | ||
616 | static ssize_t debugcmd_store(struct device *, struct device_attribute *, | ||
617 | const char *, size_t count); | ||
615 | 618 | ||
616 | static void pvr2_sysfs_add_debugifc(struct pvr2_sysfs *sfp) | 619 | static void pvr2_sysfs_add_debugifc(struct pvr2_sysfs *sfp) |
617 | { | 620 | { |
@@ -937,7 +940,8 @@ void pvr2_sysfs_class_destroy(struct pvr2_sysfs_class *clp) | |||
937 | 940 | ||
938 | 941 | ||
939 | #ifdef CONFIG_VIDEO_PVRUSB2_DEBUGIFC | 942 | #ifdef CONFIG_VIDEO_PVRUSB2_DEBUGIFC |
940 | static ssize_t debuginfo_show(struct device *class_dev,char *buf) | 943 | static ssize_t debuginfo_show(struct device *class_dev, |
944 | struct device_attribute *attr, char *buf) | ||
941 | { | 945 | { |
942 | struct pvr2_sysfs *sfp; | 946 | struct pvr2_sysfs *sfp; |
943 | sfp = (struct pvr2_sysfs *)class_dev->driver_data; | 947 | sfp = (struct pvr2_sysfs *)class_dev->driver_data; |
@@ -947,7 +951,8 @@ static ssize_t debuginfo_show(struct device *class_dev,char *buf) | |||
947 | } | 951 | } |
948 | 952 | ||
949 | 953 | ||
950 | static ssize_t debugcmd_show(struct device *class_dev,char *buf) | 954 | static ssize_t debugcmd_show(struct device *class_dev, |
955 | struct device_attribute *attr, char *buf) | ||
951 | { | 956 | { |
952 | struct pvr2_sysfs *sfp; | 957 | struct pvr2_sysfs *sfp; |
953 | sfp = (struct pvr2_sysfs *)class_dev->driver_data; | 958 | sfp = (struct pvr2_sysfs *)class_dev->driver_data; |
@@ -957,6 +962,7 @@ static ssize_t debugcmd_show(struct device *class_dev,char *buf) | |||
957 | 962 | ||
958 | 963 | ||
959 | static ssize_t debugcmd_store(struct device *class_dev, | 964 | static ssize_t debugcmd_store(struct device *class_dev, |
965 | struct device_attribute *attr, | ||
960 | const char *buf, size_t count) | 966 | const char *buf, size_t count) |
961 | { | 967 | { |
962 | struct pvr2_sysfs *sfp; | 968 | struct pvr2_sysfs *sfp; |