leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

V4L/DVB (6301): pvrusb: Update DEBUGIFC sysfs to kernel 2.6.13+

Browse Source 
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 <xyzzy@speakeasy.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Trent Piepho 2007-10-08 19:05:28 -03:00 committed by Mauro Carvalho Chehab
parent bde00cc027
commit c726b65d07
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/media/video/pvrusb2/pvrusb2-sysfs.c
View File

@ -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;