Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=c726b65d079cafabc558616badbeead442e2b114
Commit:     c726b65d079cafabc558616badbeead442e2b114
Parent:     bde00cc027879a39f249ffedb048032cb7e484e4
Author:     Trent Piepho <[EMAIL PROTECTED]>
AuthorDate: Mon Oct 8 19:05:28 2007 -0300
Committer:  Mauro Carvalho Chehab <[EMAIL PROTECTED]>
CommitDate: Wed Oct 10 00:03:20 2007 -0300

    V4L/DVB (6301): pvrusb: Update DEBUGIFC sysfs to kernel 2.6.13+
    
    The prototypes for the show and store methods of a device_attribute changed 
in
    kernel 2.6.13, but the code in pvrusb2 was never updated.  I guess the
    DEBUGIFC stuff isn't used much....
    
    Signed-off-by: Trent Piepho <[EMAIL PROTECTED]>
    Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
---
 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 b20dc44..7a78d6b 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)
 }
 
 #ifdef CONFIG_VIDEO_PVRUSB2_DEBUGIFC
-static ssize_t debuginfo_show(struct device *,char *);
-static ssize_t debugcmd_show(struct device *,char *);
-static ssize_t debugcmd_store(struct device *,const char *,size_t count);
+static ssize_t debuginfo_show(struct device *, struct device_attribute *,
+                             char *);
+static ssize_t debugcmd_show(struct device *, struct device_attribute *,
+                            char *);
+static ssize_t debugcmd_store(struct device *, struct device_attribute *,
+                             const char *, size_t count);
 
 static void pvr2_sysfs_add_debugifc(struct pvr2_sysfs *sfp)
 {
@@ -937,7 +940,8 @@ void pvr2_sysfs_class_destroy(struct pvr2_sysfs_class *clp)
 
 
 #ifdef CONFIG_VIDEO_PVRUSB2_DEBUGIFC
-static ssize_t debuginfo_show(struct device *class_dev,char *buf)
+static ssize_t debuginfo_show(struct device *class_dev,
+                             struct device_attribute *attr, char *buf)
 {
        struct pvr2_sysfs *sfp;
        sfp = (struct pvr2_sysfs *)class_dev->driver_data;
@@ -947,7 +951,8 @@ static ssize_t debuginfo_show(struct device *class_dev,char 
*buf)
 }
 
 
-static ssize_t debugcmd_show(struct device *class_dev,char *buf)
+static ssize_t debugcmd_show(struct device *class_dev,
+                            struct device_attribute *attr, char *buf)
 {
        struct pvr2_sysfs *sfp;
        sfp = (struct pvr2_sysfs *)class_dev->driver_data;
@@ -957,6 +962,7 @@ static ssize_t debugcmd_show(struct device *class_dev,char 
*buf)
 
 
 static ssize_t debugcmd_store(struct device *class_dev,
+                             struct device_attribute *attr,
                              const char *buf, size_t count)
 {
        struct pvr2_sysfs *sfp;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to