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>

9 files changed, 58 insertions, 54 deletions

diff --git a/drivers/media/video/cpia2/cpia2_core.c b/drivers/media/video/cpia2/cpia2_core.c
index f2e8b1c82c66..af8b9ec8e358 100644
--- a/drivers/media/video/cpia2/cpia2_core.c
+++ b/drivers/media/video/cpia2/cpia2_core.c
@@ -32,6 +32,7 @@
 #include "cpia2.h"
 
 #include <linux/slab.h>
+#include <linux/mm.h>
 #include <linux/vmalloc.h>
 #include <linux/firmware.h>
 
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)
 {
         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;
 }
diff --git a/drivers/media/video/pwc/pwc-if.c b/drivers/media/video/pwc/pwc-if.c
index 4625b265bf98..436a47caf52d 100644
--- a/drivers/media/video/pwc/pwc-if.c
+++ b/drivers/media/video/pwc/pwc-if.c
@@ -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
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
diff --git a/drivers/media/video/stv680.c b/drivers/media/video/stv680.c
index fdcb58b0c121..9053d5a0b1c3 100644
--- a/drivers/media/video/stv680.c
+++ b/drivers/media/video/stv680.c
@@ -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);
 }
 
 /********************************************************************
diff --git a/drivers/media/video/usbvideo/vicam.c b/drivers/media/video/usbvideo/vicam.c
index e2dec6fb0da9..b8e8fceee525 100644
--- a/drivers/media/video/usbvideo/vicam.c
+++ b/drivers/media/video/usbvideo/vicam.c
@@ -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>
diff --git a/drivers/media/video/usbvision/usbvision-core.c b/drivers/media/video/usbvision/usbvision-core.c
index 7d53de531c44..c317ed7a8482 100644
--- a/drivers/media/video/usbvision/usbvision-core.c
+++ b/drivers/media/video/usbvision/usbvision-core.c
@@ -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>
diff --git a/drivers/media/video/usbvision/usbvision-video.c b/drivers/media/video/usbvision/usbvision-video.c
index e97f955aad67..a65e5db0a325 100644
--- a/drivers/media/video/usbvision/usbvision-video.c
+++ b/drivers/media/video/usbvision/usbvision-video.c
@@ -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>
diff --git a/drivers/media/video/vpx3220.c b/drivers/media/video/vpx3220.c
index 3b83d4e2b2c3..35293029da02 100644
--- a/drivers/media/video/vpx3220.c
+++ b/drivers/media/video/vpx3220.c
@@ -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>