4 files changed, 24 insertions, 16 deletions

diff --git a/drivers/media/platform/exynos4-is/fimc-capture.c b/drivers/media/platform/exynos4-is/fimc-capture.c
index 558c528d9ce1..528f41369364 100644
--- a/drivers/media/platform/exynos4-is/fimc-capture.c
+++ b/drivers/media/platform/exynos4-is/fimc-capture.c
@@ -742,16 +742,13 @@ static void fimc_capture_try_selection(struct fimc_ctx *ctx,
 /*
  * The video node ioctl operations
  */
-static int fimc_vidioc_querycap_capture(struct file *file, void *priv,
+static int fimc_cap_querycap(struct file *file, void *priv,
                                         struct v4l2_capability *cap)
 {
         struct fimc_dev *fimc = video_drvdata(file);
 
-        strncpy(cap->driver, fimc->pdev->name, sizeof(cap->driver) - 1);
-        strncpy(cap->card, fimc->pdev->name, sizeof(cap->card) - 1);
-        cap->bus_info[0] = 0;
-        cap->capabilities = V4L2_CAP_STREAMING | V4L2_CAP_VIDEO_CAPTURE_MPLANE;
-
+        __fimc_vidioc_querycap(&fimc->pdev->dev, cap, V4L2_CAP_STREAMING |
+                                        V4L2_CAP_VIDEO_CAPTURE_MPLANE);
         return 0;
 }
 
@@ -1375,7 +1372,7 @@ static int fimc_cap_s_selection(struct file *file, void *fh,
 }
 
 static const struct v4l2_ioctl_ops fimc_capture_ioctl_ops = {
-        .vidioc_querycap                = fimc_vidioc_querycap_capture,
+        .vidioc_querycap                = fimc_cap_querycap,
 
         .vidioc_enum_fmt_vid_cap_mplane = fimc_cap_enum_fmt_mplane,
         .vidioc_try_fmt_vid_cap_mplane  = fimc_cap_try_fmt_mplane,
diff --git a/drivers/media/platform/exynos4-is/fimc-core.c b/drivers/media/platform/exynos4-is/fimc-core.c
index a8eaad0fc612..379a5e9d52a7 100644
--- a/drivers/media/platform/exynos4-is/fimc-core.c
+++ b/drivers/media/platform/exynos4-is/fimc-core.c
@@ -213,6 +213,17 @@ struct fimc_fmt *fimc_get_format(unsigned int index)
         return &fimc_formats[index];
 }
 
+void __fimc_vidioc_querycap(struct device *dev, struct v4l2_capability *cap,
+                                                unsigned int caps)
+{
+        strlcpy(cap->driver, dev->driver->name, sizeof(cap->driver));
+        strlcpy(cap->card, dev->driver->name, sizeof(cap->card));
+        snprintf(cap->bus_info, sizeof(cap->bus_info),
+                                "platform:%s", dev_name(dev));
+        cap->device_caps = caps;
+        cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
+}
+
 int fimc_check_scaler_ratio(struct fimc_ctx *ctx, int sw, int sh,
                             int dw, int dh, int rotation)
 {
@@ -1283,7 +1294,7 @@ static struct platform_driver fimc_driver = {
         .id_table       = fimc_driver_ids,
         .driver = {
                 .of_match_table = fimc_of_match,
-                .name           = FIMC_MODULE_NAME,
+                .name           = FIMC_DRIVER_NAME,
                 .owner          = THIS_MODULE,
                 .pm             = &fimc_pm_ops,
         }
diff --git a/drivers/media/platform/exynos4-is/fimc-core.h b/drivers/media/platform/exynos4-is/fimc-core.h
index 953b074d542f..539a3f71c16a 100644
--- a/drivers/media/platform/exynos4-is/fimc-core.h
+++ b/drivers/media/platform/exynos4-is/fimc-core.h
@@ -35,7 +35,7 @@
 /* Time to wait for next frame VSYNC interrupt while stopping operation. */
 #define FIMC_SHUTDOWN_TIMEOUT   ((100*HZ)/1000)
 #define MAX_FIMC_CLOCKS         2
-#define FIMC_MODULE_NAME        "s5p-fimc"
+#define FIMC_DRIVER_NAME        "exynos4-fimc"
 #define FIMC_MAX_DEVS           4
 #define FIMC_MAX_OUT_BUFS       4
 #define SCALER_MAX_HRATIO       64
@@ -620,6 +620,8 @@ static inline struct fimc_frame *ctx_get_frame(struct fimc_ctx *ctx,
 /* fimc-core.c */
 int fimc_vidioc_enum_fmt_mplane(struct file *file, void *priv,
                                 struct v4l2_fmtdesc *f);
+void __fimc_vidioc_querycap(struct device *dev, struct v4l2_capability *cap,
+                                                unsigned int caps);
 int fimc_ctrls_create(struct fimc_ctx *ctx);
 void fimc_ctrls_delete(struct fimc_ctx *ctx);
 void fimc_ctrls_activate(struct fimc_ctx *ctx, bool active);
diff --git a/drivers/media/platform/exynos4-is/fimc-m2m.c b/drivers/media/platform/exynos4-is/fimc-m2m.c
index 8449c0705e60..275a9f8d9fdb 100644
--- a/drivers/media/platform/exynos4-is/fimc-m2m.c
+++ b/drivers/media/platform/exynos4-is/fimc-m2m.c
@@ -249,22 +249,20 @@ static struct vb2_ops fimc_qops = {
  * V4L2 ioctl handlers
  */
 static int fimc_m2m_querycap(struct file *file, void *fh,
-                             struct v4l2_capability *cap)
+                                     struct v4l2_capability *cap)
 {
-        struct fimc_ctx *ctx = fh_to_ctx(fh);
-        struct fimc_dev *fimc = ctx->fimc_dev;
+        struct fimc_dev *fimc = video_drvdata(file);
+        unsigned int caps;
 
-        strncpy(cap->driver, fimc->pdev->name, sizeof(cap->driver) - 1);
-        strncpy(cap->card, fimc->pdev->name, sizeof(cap->card) - 1);
-        cap->bus_info[0] = 0;
         /*
          * This is only a mem-to-mem video device. The capture and output
          * device capability flags are left only for backward compatibility
          * and are scheduled for removal.
          */
-        cap->capabilities = V4L2_CAP_STREAMING | V4L2_CAP_VIDEO_M2M_MPLANE |
+        caps = V4L2_CAP_STREAMING | V4L2_CAP_VIDEO_M2M_MPLANE |
                 V4L2_CAP_VIDEO_CAPTURE_MPLANE | V4L2_CAP_VIDEO_OUTPUT_MPLANE;
 
+        __fimc_vidioc_querycap(&fimc->pdev->dev, cap, caps);
         return 0;
 }