Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-29 07:31:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

V4L/DVB (8488): videodev: remove some CONFIG_VIDEO_V4L1_COMPAT code from v4l2-dev.h

Browse Source 
The video_device_create_file and video_device_remove_file functions can be
removed from v4l2-dev.h, removing the dependency on videodev.h in v4l2-dev.h.

Also removed a few more videodev.h includes that should have been videodev2.h.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Hans Verkuil 2008-07-25 07:39:54 -03:00 committed by Mauro Carvalho Chehab
parent 668acf32df
commit f894dfd735
12 changed files with 60 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/common/tuners/tda9887.c
View File

@ -6,7 +6,7 @@
#include <linux/errno.h>
#include <linux/slab.h>
#include <linux/delay.h>
#include <linux/videodev.h>
#include <linux/videodev2.h>
#include <media/v4l2-common.h>
#include <media/tuner.h>
#include "tuner-i2c.h"

2
drivers/media/common/tuners/tuner-simple.c
View File

@ -6,7 +6,7 @@
*/
#include <linux/delay.h>
#include <linux/i2c.h>
#include <linux/videodev.h>
#include <linux/videodev2.h>
#include <media/tuner.h>
#include <media/v4l2-common.h>
#include <media/tuner-types.h>

1
drivers/media/video/cpia2/cpia2_core.c
View File

@ -32,6 +32,7 @@
#include "cpia2.h"
#include <linux/slab.h>
#include <linux/mm.h>
#include <linux/vmalloc.h>
#include <linux/firmware.h>

34
drivers/media/video/ov511.c
View File

@ -5660,43 +5660,43 @@ static int ov_create_sysfs(struct video_device *vdev)
{
int rc;
rc = video_device_create_file(vdev, &dev_attr_custom_id);
rc = device_create_file(&vdev->dev, &dev_attr_custom_id);
if (rc) goto err;
rc = video_device_create_file(vdev, &dev_attr_model);
rc = device_create_file(&vdev->dev, &dev_attr_model);
if (rc) goto err_id;
rc = video_device_create_file(vdev, &dev_attr_bridge);
rc = device_create_file(&vdev->dev, &dev_attr_bridge);
if (rc) goto err_model;
rc = video_device_create_file(vdev, &dev_attr_sensor);
rc = device_create_file(&vdev->dev, &dev_attr_sensor);
if (rc) goto err_bridge;
rc = video_device_create_file(vdev, &dev_attr_brightness);
rc = device_create_file(&vdev->dev, &dev_attr_brightness);
if (rc) goto err_sensor;
rc = video_device_create_file(vdev, &dev_attr_saturation);
rc = device_create_file(&vdev->dev, &dev_attr_saturation);
if (rc) goto err_bright;
rc = video_device_create_file(vdev, &dev_attr_contrast);
rc = device_create_file(&vdev->dev, &dev_attr_contrast);
if (rc) goto err_sat;
rc = video_device_create_file(vdev, &dev_attr_hue);
rc = device_create_file(&vdev->dev, &dev_attr_hue);
if (rc) goto err_contrast;
rc = video_device_create_file(vdev, &dev_attr_exposure);
rc = device_create_file(&vdev->dev, &dev_attr_exposure);
if (rc) goto err_hue;
return 0;
err_hue:
video_device_remove_file(vdev, &dev_attr_hue);
device_remove_file(&vdev->dev, &dev_attr_hue);
err_contrast:
video_device_remove_file(vdev, &dev_attr_contrast);
device_remove_file(&vdev->dev, &dev_attr_contrast);
err_sat:
video_device_remove_file(vdev, &dev_attr_saturation);
device_remove_file(&vdev->dev, &dev_attr_saturation);
err_bright:
video_device_remove_file(vdev, &dev_attr_brightness);
device_remove_file(&vdev->dev, &dev_attr_brightness);
err_sensor:
video_device_remove_file(vdev, &dev_attr_sensor);
device_remove_file(&vdev->dev, &dev_attr_sensor);
err_bridge:
video_device_remove_file(vdev, &dev_attr_bridge);
device_remove_file(&vdev->dev, &dev_attr_bridge);
err_model:
video_device_remove_file(vdev, &dev_attr_model);
device_remove_file(&vdev->dev, &dev_attr_model);
err_id:
video_device_remove_file(vdev, &dev_attr_custom_id);
device_remove_file(&vdev->dev, &dev_attr_custom_id);
err:
return rc;
}

11
drivers/media/video/pwc/pwc-if.c
View File

@ -1047,19 +1047,20 @@ static int pwc_create_sysfs_files(struct video_device *vdev)
struct pwc_device *pdev = video_get_drvdata(vdev);
int rc;
rc = video_device_create_file(vdev, &dev_attr_button);
rc = device_create_file(&vdev->dev, &dev_attr_button);
if (rc)
goto err;
if (pdev->features & FEATURE_MOTOR_PANTILT) {
rc = video_device_create_file(vdev, &dev_attr_pan_tilt);
rc = device_create_file(&vdev->dev, &dev_attr_pan_tilt);
if (rc) goto err_button;
}
return 0;
err_button:
video_device_remove_file(vdev, &dev_attr_button);
device_remove_file(&vdev->dev, &dev_attr_button);
err:
PWC_ERROR("Could not create sysfs files.\n");
return rc;
}
@ -1067,8 +1068,8 @@ static void pwc_remove_sysfs_files(struct video_device *vdev)
{
struct pwc_device *pdev = video_get_drvdata(vdev);
if (pdev->features & FEATURE_MOTOR_PANTILT)
video_device_remove_file(vdev, &dev_attr_pan_tilt);
video_device_remove_file(vdev, &dev_attr_button);
device_remove_file(&vdev->dev, &dev_attr_pan_tilt);
device_remove_file(&vdev->dev, &dev_attr_button);
}
#ifdef CONFIG_USB_PWC_DEBUG

14
drivers/media/video/stk-webcam.c
View File

@ -341,17 +341,19 @@ static int stk_create_sysfs_files(struct video_device *vdev)
{
int ret;
ret = video_device_create_file(vdev, &dev_attr_brightness);
ret += video_device_create_file(vdev, &dev_attr_hflip);
ret += video_device_create_file(vdev, &dev_attr_vflip);
ret = device_create_file(&vdev->dev, &dev_attr_brightness);
ret += device_create_file(&vdev->dev, &dev_attr_hflip);
ret += device_create_file(&vdev->dev, &dev_attr_vflip);
if (ret)
STK_WARNING("Could not create sysfs files\n");
return ret;
}
static void stk_remove_sysfs_files(struct video_device *vdev)
{
video_device_remove_file(vdev, &dev_attr_brightness);
video_device_remove_file(vdev, &dev_attr_hflip);
video_device_remove_file(vdev, &dev_attr_vflip);
device_remove_file(&vdev->dev, &dev_attr_brightness);
device_remove_file(&vdev->dev, &dev_attr_hflip);
device_remove_file(&vdev->dev, &dev_attr_vflip);
}
#else

47
drivers/media/video/stv680.c
View File

@ -525,53 +525,54 @@ static int stv680_create_sysfs_files(struct video_device *vdev)
{
int rc;
rc = video_device_create_file(vdev, &dev_attr_model);
rc = device_create_file(&vdev->dev, &dev_attr_model);
if (rc) goto err;
rc = video_device_create_file(vdev, &dev_attr_in_use);
rc = device_create_file(&vdev->dev, &dev_attr_in_use);
if (rc) goto err_model;
rc = video_device_create_file(vdev, &dev_attr_streaming);
rc = device_create_file(&vdev->dev, &dev_attr_streaming);
if (rc) goto err_inuse;
rc = video_device_create_file(vdev, &dev_attr_palette);
rc = device_create_file(&vdev->dev, &dev_attr_palette);
if (rc) goto err_stream;
rc = video_device_create_file(vdev, &dev_attr_frames_total);
rc = device_create_file(&vdev->dev, &dev_attr_frames_total);
if (rc) goto err_pal;
rc = video_device_create_file(vdev, &dev_attr_frames_read);
rc = device_create_file(&vdev->dev, &dev_attr_frames_read);
if (rc) goto err_framtot;
rc = video_device_create_file(vdev, &dev_attr_packets_dropped);
rc = device_create_file(&vdev->dev, &dev_attr_packets_dropped);
if (rc) goto err_framread;
rc = video_device_create_file(vdev, &dev_attr_decoding_errors);
rc = device_create_file(&vdev->dev, &dev_attr_decoding_errors);
if (rc) goto err_dropped;
return 0;
err_dropped:
video_device_remove_file(vdev, &dev_attr_packets_dropped);
device_remove_file(&vdev->dev, &dev_attr_packets_dropped);
err_framread:
video_device_remove_file(vdev, &dev_attr_frames_read);
device_remove_file(&vdev->dev, &dev_attr_frames_read);
err_framtot:
video_device_remove_file(vdev, &dev_attr_frames_total);
device_remove_file(&vdev->dev, &dev_attr_frames_total);
err_pal:
video_device_remove_file(vdev, &dev_attr_palette);
device_remove_file(&vdev->dev, &dev_attr_palette);
err_stream:
video_device_remove_file(vdev, &dev_attr_streaming);
device_remove_file(&vdev->dev, &dev_attr_streaming);
err_inuse:
video_device_remove_file(vdev, &dev_attr_in_use);
device_remove_file(&vdev->dev, &dev_attr_in_use);
err_model:
video_device_remove_file(vdev, &dev_attr_model);
device_remove_file(&vdev->dev, &dev_attr_model);
err:
PDEBUG(0, "STV(e): Could not create sysfs files");
return rc;
}
static void stv680_remove_sysfs_files(struct video_device *vdev)
{
video_device_remove_file(vdev, &dev_attr_model);
video_device_remove_file(vdev, &dev_attr_in_use);
video_device_remove_file(vdev, &dev_attr_streaming);
video_device_remove_file(vdev, &dev_attr_palette);
video_device_remove_file(vdev, &dev_attr_frames_total);
video_device_remove_file(vdev, &dev_attr_frames_read);
video_device_remove_file(vdev, &dev_attr_packets_dropped);
video_device_remove_file(vdev, &dev_attr_decoding_errors);
device_remove_file(&vdev->dev, &dev_attr_model);
device_remove_file(&vdev->dev, &dev_attr_in_use);
device_remove_file(&vdev->dev, &dev_attr_streaming);
device_remove_file(&vdev->dev, &dev_attr_palette);
device_remove_file(&vdev->dev, &dev_attr_frames_total);
device_remove_file(&vdev->dev, &dev_attr_frames_read);
device_remove_file(&vdev->dev, &dev_attr_packets_dropped);
device_remove_file(&vdev->dev, &dev_attr_decoding_errors);
}
/********************************************************************

1
drivers/media/video/usbvideo/vicam.c
View File

@ -41,6 +41,7 @@
#include <linux/videodev.h>
#include <linux/usb.h>
#include <linux/vmalloc.h>
#include <linux/mm.h>
#include <linux/slab.h>
#include <linux/mutex.h>
#include <linux/firmware.h>

1
drivers/media/video/usbvision/usbvision-core.c
View File

@ -30,7 +30,6 @@
#include <linux/mm.h>
#include <linux/utsname.h>
#include <linux/highmem.h>
#include <linux/videodev.h>
#include <linux/vmalloc.h>
#include <linux/module.h>
#include <linux/init.h>

1
drivers/media/video/usbvision/usbvision-video.c
View File

@ -53,7 +53,6 @@
#include <linux/mm.h>
#include <linux/utsname.h>
#include <linux/highmem.h>
#include <linux/videodev.h>
#include <linux/vmalloc.h>
#include <linux/module.h>
#include <linux/init.h>

2
drivers/media/video/vpx3220.c
View File

@ -33,7 +33,7 @@
#define I2C_NAME(x) (x)->name
#include <linux/videodev2.h>
#include <linux/videodev.h>
#include <media/v4l2-common.h>
#include <linux/video_decoder.h>

25
include/media/v4l2-dev.h
View File

@ -16,11 +16,7 @@
#include <linux/device.h>
#include <linux/mutex.h>
#include <linux/compiler.h> /* need __user */
#ifdef CONFIG_VIDEO_V4L1_COMPAT
#include <linux/videodev.h>
#else
#include <linux/videodev2.h>
#endif
#define VIDEO_MAJOR 81
/* Minor device allocation */
@ -102,27 +98,6 @@ void video_unregister_device(struct video_device *);
struct video_device *video_device_alloc(void);
void video_device_release(struct video_device *vfd);
#ifdef CONFIG_VIDEO_V4L1_COMPAT
#include <linux/mm.h>
static inline int __must_check
video_device_create_file(struct video_device *vfd,
struct device_attribute *attr)
{
int ret = device_create_file(&vfd->dev, attr);
if (ret < 0)
printk(KERN_WARNING "%s error: %d\n", __func__, ret);
return ret;
}
static inline void
video_device_remove_file(struct video_device *vfd,
struct device_attribute *attr)
{
device_remove_file(&vfd->dev, attr);
}
#endif /* CONFIG_VIDEO_V4L1_COMPAT */
#ifdef OBSOLETE_DEVDATA /* to be removed soon */
/* helper functions to access driver private data. */
static inline void *video_get_drvdata(struct video_device *dev)