maru_camera: fix compilation errors

"MARU_CAMERA" is built as a default. But it is not work properly
on runtime since v4l2-ioctl failed to probe capability.

Change-Id: Ia22553ad48024b1864db60985507d0eadfe311d4
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

diff --git a/arch/x86/configs/tizen_emul_defconfig b/arch/x86/configs/tizen_emul_defconfig
index 82c5574..f07b033 100644 (file)
--- a/arch/x86/configs/tizen_emul_defconfig
+++ b/arch/x86/configs/tizen_emul_defconfig
@@ -2492,6 +2492,8 @@ CONFIG_VIDEO_DEV=y
 CONFIG_VIDEO_V4L2=y
 # CONFIG_VIDEO_ADV_DEBUG is not set
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+CONFIG_VIDEOBUF_GEN=y
+CONFIG_VIDEOBUF_VMALLOC=y
 # CONFIG_TTPCI_EEPROM is not set
 
 #
@@ -3434,7 +3436,7 @@ CONFIG_ANDROID=y
 # CONFIG_FPGA is not set
 CONFIG_MARU=y
 CONFIG_MARU_VIRTIO_TOUCHSCREEN=y
-# CONFIG_MARU_CAMERA is not set
+CONFIG_MARU_CAMERA=y
 CONFIG_MARU_BACKLIGHT=y
 CONFIG_MARU_JACK=y
 CONFIG_MARU_VIRTIO_HWKEY=y

diff --git a/drivers/maru/maru_camera.c b/drivers/maru/maru_camera.c
index 483c036..6576396 100644 (file)
--- a/drivers/maru/maru_camera.c
+++ b/drivers/maru/maru_camera.c
@@ -1210,7 +1210,7 @@ static const struct v4l2_file_operations marucam_fops = {
        .release        = marucam_close,
        .poll           = marucam_poll,
        .mmap           = marucam_mmap,
-       .ioctl          = video_ioctl2,
+       .unlocked_ioctl         = video_ioctl2,
 };
 
 static struct video_device marucam_video_dev = {
@@ -1232,25 +1232,6 @@ static const struct pci_device_id marucam_pci_id_tbl[] = {
 
 MODULE_DEVICE_TABLE(pci, marucam_pci_id_tbl);
 
-/* The following function already exist in the latest linux stable kernel.
- * https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/
- * commit/?id=c43996f4001de629af4a4d6713782e883677e5b9
- * This should be removed if emulator-kernel is upgraded.
- */
-static void __iomem *pci_ioremap_wc_bar(struct pci_dev *pdev, int bar)
-{
-       /*
-       * Make sure the BAR is actually a memory resource, not an IO resource
-       */
-       if (!(pci_resource_flags(pdev, bar) & IORESOURCE_MEM)) {
-               WARN_ON(1);
-               return NULL;
-       }
-
-       return ioremap_wc(pci_resource_start(pdev, bar),
-                       pci_resource_len(pdev, bar));
-}
-
 static int marucam_pci_initdev(struct pci_dev *pdev,
                                const struct pci_device_id *id)
 {