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>

1 files changed, 8 insertions, 6 deletions

diff --git a/drivers/media/video/stk-webcam.c b/drivers/media/video/stk-webcam.c
index 8d5fa95ad95a..8aa56fe02546 100644
--- a/drivers/media/video/stk-webcam.c
+++ b/drivers/media/video/stk-webcam.c
@@ -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