From 2077ee796fefb8f80d43b5318e6f1b54d235a3ea Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Tue, 18 Jul 2006 15:28:09 -0300 Subject: Check __must_check warning in video_device_create_file From: Michael Krufky This patch moves the check from bttv-driver.c into v4l2-dev.h, because all other callers of video_device_create_file must also be checked. Signed-off-by: Michael Krufky cc: Randy Dunlap Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/video/bt8xx/bttv-driver.c | 11 ----------- linux/include/media/v4l2-dev.h | 5 ++++- 2 files changed, 4 insertions(+), 12 deletions(-) (limited to 'linux') diff --git a/linux/drivers/media/video/bt8xx/bttv-driver.c b/linux/drivers/media/video/bt8xx/bttv-driver.c index 0903a3803..a43764dea 100644 --- a/linux/drivers/media/video/bt8xx/bttv-driver.c +++ b/linux/drivers/media/video/bt8xx/bttv-driver.c @@ -3942,10 +3942,6 @@ static void bttv_unregister_video(struct bttv *btv) /* register video4linux devices */ static int __devinit bttv_register_video(struct bttv *btv) { -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,17) - int ret; -#endif - if (no_overlay <= 0) { bttv_video_template.type |= VID_TYPE_OVERLAY; } else { @@ -3960,16 +3956,9 @@ 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,6,17) - ret = video_device_create_file(btv->video_dev, &class_device_attr_card); - if (ret < 0) - printk(KERN_WARNING "bttv: video_device_create_file error: " - "%d\n", ret); -#else #if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) video_device_create_file(btv->video_dev, &class_device_attr_card); -#endif #endif /* vbi */ diff --git a/linux/include/media/v4l2-dev.h b/linux/include/media/v4l2-dev.h index b3b196b88..171a63f65 100644 --- a/linux/include/media/v4l2-dev.h +++ b/linux/include/media/v4l2-dev.h @@ -380,7 +380,10 @@ static inline int video_device_create_file(struct video_device *vfd, struct class_device_attribute *attr) { - return class_device_create_file(&vfd->class_dev, attr); + int ret = class_device_create_file(&vfd->class_dev, attr); + if (ret < 0) + printk(KERN_WARNING "%s error: %d\n", __FUNCTION__, ret); + return ret; } static inline void video_device_remove_file(struct video_device *vfd, -- cgit v1.2.3