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>
This commit is contained in:

committed by
Mauro Carvalho Chehab

parent
668acf32df
commit
f894dfd735
@@ -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
|
||||
|
Reference in New Issue
Block a user