diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-07-25 12:39:54 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2008-07-25 12:39:54 +0200 |
| commit | ddb6d77848776ec7f6b3135f2dfa5fbc1544b003 (patch) | |
| tree | e4cdb2a470f816c0d4d5490fd011a1d8beb9bb05 /linux/drivers/media/video/pwc | |
| parent | c201b83b7aab962a7369b64863ba52ec2b973659 (diff) | |
| download | mediapointer-dvb-s2-ddb6d77848776ec7f6b3135f2dfa5fbc1544b003.tar.gz mediapointer-dvb-s2-ddb6d77848776ec7f6b3135f2dfa5fbc1544b003.tar.bz2 | |
videodev: remove some CONFIG_VIDEO_V4L1_COMPAT code from v4l2-dev.h
From: Hans Verkuil <hverkuil@xs4all.nl>
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>
Diffstat (limited to 'linux/drivers/media/video/pwc')
| -rw-r--r-- | linux/drivers/media/video/pwc/pwc-if.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/linux/drivers/media/video/pwc/pwc-if.c b/linux/drivers/media/video/pwc/pwc-if.c index e8e8fd280..dc1e9c6b4 100644 --- a/linux/drivers/media/video/pwc/pwc-if.c +++ b/linux/drivers/media/video/pwc/pwc-if.c @@ -1051,19 +1051,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; } @@ -1071,8 +1072,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 |