diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-07-19 11:43:17 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-07-19 11:43:17 -0300 |
| commit | a9e9a6602d4ad20320cee50abb6568d03799e1a6 (patch) | |
| tree | 99e1e30bc8bb46aef497a2c6fc74d1c50d5a772c /linux | |
| parent | 8ca6277222be28b84f147cba6e1d5a7486142b0d (diff) | |
| download | mediapointer-dvb-s2-a9e9a6602d4ad20320cee50abb6568d03799e1a6.tar.gz mediapointer-dvb-s2-a9e9a6602d4ad20320cee50abb6568d03799e1a6.tar.bz2 | |
[PATCH] devfs: Remove the videodevice devfs_name field as it's no longer needed
From: Mauro Carvalho Chehab <mchehab@infradead.org>
kernel-sync: backport from kernel to v4l/dvb tree
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/video/videodev.c | 2 | ||||
| -rw-r--r-- | linux/include/media/v4l2-dev.h | 8 |
2 files changed, 1 insertions, 9 deletions
diff --git a/linux/drivers/media/video/videodev.c b/linux/drivers/media/video/videodev.c index f236bc6c7..7d0076a0f 100644 --- a/linux/drivers/media/video/videodev.c +++ b/linux/drivers/media/video/videodev.c @@ -1592,7 +1592,7 @@ int video_register_device(struct video_device *vfd, int type, int nr) #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12) vfd->class_dev.devt = MKDEV(VIDEO_MAJOR, vfd->minor); #endif - strlcpy(vfd->class_dev.class_id, vfd->devfs_name + 4, BUS_ID_SIZE); + sprintf(vfd->class_dev.class_id, "%s%d", name_base, i - base); ret = class_device_register(&vfd->class_dev); if (ret) { printk(KERN_ERR "%s: class_device_register failed\n", diff --git a/linux/include/media/v4l2-dev.h b/linux/include/media/v4l2-dev.h index 171a63f65..8c3fd8fdd 100644 --- a/linux/include/media/v4l2-dev.h +++ b/linux/include/media/v4l2-dev.h @@ -13,9 +13,6 @@ #include <linux/poll.h> #include <linux/fs.h> -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,69) -#include <linux/devfs_fs_kernel.h> -#endif #if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) #include <linux/device.h> #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) @@ -341,11 +338,6 @@ void *priv; #else struct semaphore lock; /* ... helper function uses these */ #endif -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,69) - devfs_handle_t devfs_handle; /* devfs */ -#else - char devfs_name[64]; /* devfs */ -#endif #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) struct class_device class_dev; /* sysfs */ #endif |