diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-07-25 06:39:54 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-26 12:18:11 -0400 |
commit | f894dfd735237548d282d6fd55b6ebb4b2fd9ef2 (patch) | |
tree | bf7313318e8653d82ddfd001de742c48e93f1f9d /drivers/media/video/ov511.c | |
parent | 668acf32dfa1f1a975213f77bf17ee435f5a8edd (diff) |
V4L/DVB (8488): videodev: remove some CONFIG_VIDEO_V4L1_COMPAT code from v4l2-dev.h
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>
Diffstat (limited to 'drivers/media/video/ov511.c')
-rw-r--r-- | drivers/media/video/ov511.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/drivers/media/video/ov511.c b/drivers/media/video/ov511.c index f732b035570f..2374ebc084d4 100644 --- a/drivers/media/video/ov511.c +++ b/drivers/media/video/ov511.c | |||
@@ -5660,43 +5660,43 @@ static int ov_create_sysfs(struct video_device *vdev) | |||
5660 | { | 5660 | { |
5661 | int rc; | 5661 | int rc; |
5662 | 5662 | ||
5663 | rc = video_device_create_file(vdev, &dev_attr_custom_id); | 5663 | rc = device_create_file(&vdev->dev, &dev_attr_custom_id); |
5664 | if (rc) goto err; | 5664 | if (rc) goto err; |
5665 | rc = video_device_create_file(vdev, &dev_attr_model); | 5665 | rc = device_create_file(&vdev->dev, &dev_attr_model); |
5666 | if (rc) goto err_id; | 5666 | if (rc) goto err_id; |
5667 | rc = video_device_create_file(vdev, &dev_attr_bridge); | 5667 | rc = device_create_file(&vdev->dev, &dev_attr_bridge); |
5668 | if (rc) goto err_model; | 5668 | if (rc) goto err_model; |
5669 | rc = video_device_create_file(vdev, &dev_attr_sensor); | 5669 | rc = device_create_file(&vdev->dev, &dev_attr_sensor); |
5670 | if (rc) goto err_bridge; | 5670 | if (rc) goto err_bridge; |
5671 | rc = video_device_create_file(vdev, &dev_attr_brightness); | 5671 | rc = device_create_file(&vdev->dev, &dev_attr_brightness); |
5672 | if (rc) goto err_sensor; | 5672 | if (rc) goto err_sensor; |
5673 | rc = video_device_create_file(vdev, &dev_attr_saturation); | 5673 | rc = device_create_file(&vdev->dev, &dev_attr_saturation); |
5674 | if (rc) goto err_bright; | 5674 | if (rc) goto err_bright; |
5675 | rc = video_device_create_file(vdev, &dev_attr_contrast); | 5675 | rc = device_create_file(&vdev->dev, &dev_attr_contrast); |
5676 | if (rc) goto err_sat; | 5676 | if (rc) goto err_sat; |
5677 | rc = video_device_create_file(vdev, &dev_attr_hue); | 5677 | rc = device_create_file(&vdev->dev, &dev_attr_hue); |
5678 | if (rc) goto err_contrast; | 5678 | if (rc) goto err_contrast; |
5679 | rc = video_device_create_file(vdev, &dev_attr_exposure); | 5679 | rc = device_create_file(&vdev->dev, &dev_attr_exposure); |
5680 | if (rc) goto err_hue; | 5680 | if (rc) goto err_hue; |
5681 | 5681 | ||
5682 | return 0; | 5682 | return 0; |
5683 | 5683 | ||
5684 | err_hue: | 5684 | err_hue: |
5685 | video_device_remove_file(vdev, &dev_attr_hue); | 5685 | device_remove_file(&vdev->dev, &dev_attr_hue); |
5686 | err_contrast: | 5686 | err_contrast: |
5687 | video_device_remove_file(vdev, &dev_attr_contrast); | 5687 | device_remove_file(&vdev->dev, &dev_attr_contrast); |
5688 | err_sat: | 5688 | err_sat: |
5689 | video_device_remove_file(vdev, &dev_attr_saturation); | 5689 | device_remove_file(&vdev->dev, &dev_attr_saturation); |
5690 | err_bright: | 5690 | err_bright: |
5691 | video_device_remove_file(vdev, &dev_attr_brightness); | 5691 | device_remove_file(&vdev->dev, &dev_attr_brightness); |
5692 | err_sensor: | 5692 | err_sensor: |
5693 | video_device_remove_file(vdev, &dev_attr_sensor); | 5693 | device_remove_file(&vdev->dev, &dev_attr_sensor); |
5694 | err_bridge: | 5694 | err_bridge: |
5695 | video_device_remove_file(vdev, &dev_attr_bridge); | 5695 | device_remove_file(&vdev->dev, &dev_attr_bridge); |
5696 | err_model: | 5696 | err_model: |
5697 | video_device_remove_file(vdev, &dev_attr_model); | 5697 | device_remove_file(&vdev->dev, &dev_attr_model); |
5698 | err_id: | 5698 | err_id: |
5699 | video_device_remove_file(vdev, &dev_attr_custom_id); | 5699 | device_remove_file(&vdev->dev, &dev_attr_custom_id); |
5700 | err: | 5700 | err: |
5701 | return rc; | 5701 | return rc; |
5702 | } | 5702 | } |