Skip to content

Commit

Permalink
[PATCH] devfs: Remove the videodevice devfs_name field as it's no lon…
Browse files Browse the repository at this point in the history
…ger needed

Also fixes all drivers that set this field.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Greg Kroah-Hartman committed Jun 26, 2006
1 parent ce7b0f4 commit 5e48307
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
3 changes: 1 addition & 2 deletions drivers/media/video/videodev.c
Original file line number Diff line number Diff line change
Expand Up @@ -1570,8 +1570,7 @@ int video_register_device(struct video_device *vfd, int type, int nr)
vfd->class_dev.dev = vfd->dev;
vfd->class_dev.class = &video_class;
vfd->class_dev.devt = MKDEV(VIDEO_MAJOR, vfd->minor);
sprintf(vfd->devfs_name, "%s%d", name_base, i - base);
strlcpy(vfd->class_dev.class_id, vfd->devfs_name, BUS_ID_SIZE);
sprintf(vfd->class_dev.class_id, "%s%d", name_base, i - base);
class_device_register(&vfd->class_dev);
class_device_create_file(&vfd->class_dev,
&class_device_attr_name);
Expand Down
1 change: 0 additions & 1 deletion include/media/v4l2-dev.h
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,6 @@ void *priv;
/* for videodev.c intenal usage -- please don't touch */
int users; /* video_exclusive_{open|close} ... */
struct mutex lock; /* ... helper function uses these */
char devfs_name[64]; /* devfs */
struct class_device class_dev; /* sysfs */
};

Expand Down

0 comments on commit 5e48307

Please sign in to comment.