diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2005-06-20 21:15:16 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-26 12:25:08 -0700 |
| commit | 5e483075a1f9862a65af648d1d939499969c7b5d (patch) | |
| tree | a510b8051e026ccf3fdbcff437cbe724700c96bf | |
| parent | ce7b0f46bbf4bff8daab2dd3d878b9e72a623d09 (diff) | |
| download | lwn-5e483075a1f9862a65af648d1d939499969c7b5d.tar.gz lwn-5e483075a1f9862a65af648d1d939499969c7b5d.zip | |
[PATCH] devfs: Remove the videodevice devfs_name field as it's no longer needed
Also fixes all drivers that set this field.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/media/video/videodev.c | 3 | ||||
| -rw-r--r-- | include/media/v4l2-dev.h | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/video/videodev.c b/drivers/media/video/videodev.c index a802a7e0df79..b26ebaff226f 100644 --- a/drivers/media/video/videodev.c +++ b/drivers/media/video/videodev.c @@ -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); diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h index a1b473190e65..62dae1a8c441 100644 --- a/include/media/v4l2-dev.h +++ b/include/media/v4l2-dev.h @@ -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 */ }; |