Driver core: change add_uevent_var to use a struct

[linux-2.6-omap-h63xx.git] / drivers / media / video / pvrusb2 / pvrusb2-sysfs.c

diff --git a/drivers/media/video/pvrusb2/pvrusb2-sysfs.c b/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
index b20dc4421d592630fe379dc85abda523d67b3944..2ee3c3049e8f3dd1a9154821cbfdf1b989305c5d 100644 (file)
--- 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)
 {
@@ -902,8 +905,8 @@ struct pvr2_sysfs *pvr2_sysfs_create(struct pvr2_context *mp,
 }
 
 
-static int pvr2_sysfs_hotplug(struct device *cd,char **envp,
-                             int numenvp,char *buf,int size)
+static int pvr2_sysfs_hotplug(struct device *d,
+                             struct kobj_uevent_env *env)
 {
        /* Even though we don't do anything here, we still need this function
           because sysfs will still try to call it. */
@@ -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;