diff options
| author | Trent Piepho <xyzzy@speakeasy.org> | 2006-07-25 09:32:49 -0300 |
|---|---|---|
| committer | Trent Piepho <xyzzy@speakeasy.org> | 2006-07-25 09:32:49 -0300 |
| commit | 68a97b349e64755edc45ac762b1b4ca3eb0fbcf9 (patch) | |
| tree | 58515625738a6da2b49b8c746e27c2fc6a78fc2e | |
| parent | 6a08e4d1f06580b112a2e493d69cbd65be8f50b3 (diff) | |
| download | mediapointer-dvb-s2-68a97b349e64755edc45ac762b1b4ca3eb0fbcf9.tar.gz mediapointer-dvb-s2-68a97b349e64755edc45ac762b1b4ca3eb0fbcf9.tar.bz2 | |
bttv: clean up some pre-2.6.0 class device compat stuff
From: Trent Piepho <xyzzy@speakeasy.org>
Add bit of compat code for class_device_create_file() to compat.h for
pre-2.6.0 kernels. This allows an #ifdef to be removed from
bttv-driver.c, and helps other code which never had one. Changed the
code to turn on for pre-2.6.0, rather than pre-2.5.0, as the class device
stuff was added in 2.5.69.
Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
| -rw-r--r-- | linux/drivers/media/video/bt8xx/bttv-driver.c | 4 | ||||
| -rw-r--r-- | v4l/compat.h | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/linux/drivers/media/video/bt8xx/bttv-driver.c b/linux/drivers/media/video/bt8xx/bttv-driver.c index b0342f583..7f75861b0 100644 --- a/linux/drivers/media/video/bt8xx/bttv-driver.c +++ b/linux/drivers/media/video/bt8xx/bttv-driver.c @@ -158,7 +158,7 @@ MODULE_LICENSE("GPL"); /* ----------------------------------------------------------------------- */ /* sysfs */ -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) static ssize_t show_card(struct class_device *cd, char *buf) { struct video_device *vfd = to_video_device(cd); @@ -3956,14 +3956,12 @@ static int __devinit bttv_register_video(struct bttv *btv) goto err; printk(KERN_INFO "bttv%d: registered device video%d\n", btv->c.nr,btv->video_dev->minor & 0x1f); -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) if (class_device_create_file(&btv->video_dev->class_dev, &class_device_attr_card)<0) { printk(KERN_ERR "bttv%d: class_device_create_file 'card' " "failed\n", btv->c.nr); goto err; } -#endif /* vbi */ btv->vbi_dev = vdev_init(btv, &bttv_vbi_template, "vbi"); diff --git a/v4l/compat.h b/v4l/compat.h index 08ac828d6..9918f2e46 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -249,6 +249,11 @@ static inline unsigned long vmalloc_to_pfn(void * vmalloc_addr) #endif #endif +/* The class_device system didn't appear until 2.5.69 */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) +#define class_device_create_file(a, b) (0) +#endif + #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13) # define class_device_create(a, b, c, d, e, f, g, h) class_simple_device_add(a, c, d, e, f, g, h) # define class_device_destroy(a, b) class_simple_device_remove(b) |