Re: [PATCH] soc-camera: fix device capabilities in multiple camera host drivers

[Geert Uytterhoeven]

Hi Guennadi,

On Mon, Jan 19, 2015 at 11:19 PM, Guennadi Liakhovetski
g.liakhovet...@gmx.de wrote:
 The V4L2 API requires both .capabilities and .device_caps fields of
 struct v4l2_capability to be set. Otherwise the compliance checker
 complains and since commit v4l2-ioctl: WARN_ON if querycap didn't fill
 device_caps a compile-time warning is issued. Fix this non-compliance
 in several soc-camera camera host drivers.

Thanks, works fine on r8a7740/armadillo-legacy!

 Reported-by: Geert Uytterhoeven ge...@linux-m68k.org
 Signed-off-by: Guennadi Liakhovetski g.liakhovet...@gmx.de

Tested-by: Geert Uytterhoeven geert+rene...@glider.be

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- ge...@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say programmer or something like that.
-- Linus Torvalds
--
To unsubscribe from this list: send the line unsubscribe linux-media in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH] soc-camera: fix device capabilities in multiple camera host drivers

[Guennadi Liakhovetski]

The V4L2 API requires both .capabilities and .device_caps fields of
struct v4l2_capability to be set. Otherwise the compliance checker
complains and since commit v4l2-ioctl: WARN_ON if querycap didn't fill
device_caps a compile-time warning is issued. Fix this non-compliance
in several soc-camera camera host drivers.

Reported-by: Geert Uytterhoeven ge...@linux-m68k.org
Signed-off-by: Guennadi Liakhovetski g.liakhovet...@gmx.de
---

Only compile tested on one platform. Would be nice to have a slightly 
wider test coverage. I'll try to do some more verification too, then send 
out as a fix for 3.19 in a day or two.

 drivers/media/platform/soc_camera/atmel-isi.c| 5 +++--
 drivers/media/platform/soc_camera/mx2_camera.c   | 3 ++-
 drivers/media/platform/soc_camera/mx3_camera.c   | 3 ++-
 drivers/media/platform/soc_camera/omap1_camera.c | 3 ++-
 drivers/media/platform/soc_camera/pxa_camera.c   | 3 ++-
 drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c | 4 +++-
 6 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/drivers/media/platform/soc_camera/atmel-isi.c 
b/drivers/media/platform/soc_camera/atmel-isi.c
index 8efe403..6d88523 100644
--- a/drivers/media/platform/soc_camera/atmel-isi.c
+++ b/drivers/media/platform/soc_camera/atmel-isi.c
@@ -760,8 +760,9 @@ static int isi_camera_querycap(struct soc_camera_host *ici,
 {
strcpy(cap-driver, atmel-isi);
strcpy(cap-card, Atmel Image Sensor Interface);
-   cap-capabilities = (V4L2_CAP_VIDEO_CAPTURE |
-   V4L2_CAP_STREAMING);
+   cap-device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;
+   cap-capabilities = cap-device_caps | V4L2_CAP_DEVICE_CAPS;
+
return 0;
 }
 
diff --git a/drivers/media/platform/soc_camera/mx2_camera.c 
b/drivers/media/platform/soc_camera/mx2_camera.c
index ce72bd2..192377f 100644
--- a/drivers/media/platform/soc_camera/mx2_camera.c
+++ b/drivers/media/platform/soc_camera/mx2_camera.c
@@ -1256,7 +1256,8 @@ static int mx2_camera_querycap(struct soc_camera_host 
*ici,
 {
/* cap-name is set by the friendly caller:- */
strlcpy(cap-card, MX2_CAM_DRIVER_DESCRIPTION, sizeof(cap-card));
-   cap-capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;
+   cap-device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;
+   cap-capabilities = cap-device_caps | V4L2_CAP_DEVICE_CAPS;
 
return 0;
 }
diff --git a/drivers/media/platform/soc_camera/mx3_camera.c 
b/drivers/media/platform/soc_camera/mx3_camera.c
index a60c3bb..0b3299d 100644
--- a/drivers/media/platform/soc_camera/mx3_camera.c
+++ b/drivers/media/platform/soc_camera/mx3_camera.c
@@ -967,7 +967,8 @@ static int mx3_camera_querycap(struct soc_camera_host *ici,
 {
/* cap-name is set by the firendly caller:- */
strlcpy(cap-card, i.MX3x Camera, sizeof(cap-card));
-   cap-capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;
+   cap-device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;
+   cap-capabilities = cap-device_caps | V4L2_CAP_DEVICE_CAPS;
 
return 0;
 }
diff --git a/drivers/media/platform/soc_camera/omap1_camera.c 
b/drivers/media/platform/soc_camera/omap1_camera.c
index e6b9328..16f65ec 100644
--- a/drivers/media/platform/soc_camera/omap1_camera.c
+++ b/drivers/media/platform/soc_camera/omap1_camera.c
@@ -1427,7 +1427,8 @@ static int omap1_cam_querycap(struct soc_camera_host *ici,
 {
/* cap-name is set by the friendly caller:- */
strlcpy(cap-card, OMAP1 Camera, sizeof(cap-card));
-   cap-capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;
+   cap-device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;
+   cap-capabilities = cap-device_caps | V4L2_CAP_DEVICE_CAPS;
 
return 0;
 }
diff --git a/drivers/media/platform/soc_camera/pxa_camera.c 
b/drivers/media/platform/soc_camera/pxa_camera.c
index 951226a..8d6e343 100644
--- a/drivers/media/platform/soc_camera/pxa_camera.c
+++ b/drivers/media/platform/soc_camera/pxa_camera.c
@@ -1576,7 +1576,8 @@ static int pxa_camera_querycap(struct soc_camera_host 
*ici,
 {
/* cap-name is set by the firendly caller:- */
strlcpy(cap-card, pxa_cam_driver_description, sizeof(cap-card));
-   cap-capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;
+   cap-device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;
+   cap-capabilities = cap-device_caps | V4L2_CAP_DEVICE_CAPS;
 
return 0;
 }
diff --git a/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c 
b/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c
index 8b27b3e..7178770 100644
--- a/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c
+++ b/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c
@@ -1652,7 +1652,9 @@ static int sh_mobile_ceu_querycap(struct soc_camera_host 
*ici,
  struct v4l2_capability *cap)
 {
strlcpy(cap-card, SuperH_Mobile_CEU,