[media] media: davinci: vpif_capture: use SIMPLE_DEV_PM_OPS

this patch uses SIMPLE_DEV_PM_OPS, and drops unneeded members
from io_usrs, usrs and makes use of vb2 helepers instead.

Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c
index 799c226d0995ea57d28f88d38044006d181adf87..ce532034ba7c251f5775980fc19cb3ab8ef12bf6 100644 (file)
--- a/drivers/media/platform/davinci/vpif_capture.c
+++ b/drivers/media/platform/davinci/vpif_capture.c
@@ -1647,7 +1647,7 @@ static int vpif_remove(struct platform_device *device)
        return 0;
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 /**
  * vpif_suspend: vpif device suspend
  */
@@ -1662,18 +1662,20 @@ static int vpif_suspend(struct device *dev)
                /* Get the pointer to the channel object */
                ch = vpif_obj.dev[i];
                common = &ch->common[VPIF_VIDEO_INDEX];
+
+               if (!vb2_is_streaming(&common->buffer_queue))
+                       continue;
+
                mutex_lock(&common->lock);
-               if (ch->usrs && common->io_usrs) {
-                       /* Disable channel */
-                       if (ch->channel_id == VPIF_CHANNEL0_VIDEO) {
-                               enable_channel0(0);
-                               channel0_intr_enable(0);
-                       }
-                       if (ch->channel_id == VPIF_CHANNEL1_VIDEO ||
-                               ycmux_mode == 2) {
-                               enable_channel1(0);
-                               channel1_intr_enable(0);
-                       }
+               /* Disable channel */
+               if (ch->channel_id == VPIF_CHANNEL0_VIDEO) {
+                       enable_channel0(0);
+                       channel0_intr_enable(0);
+               }
+               if (ch->channel_id == VPIF_CHANNEL1_VIDEO ||
+                       ycmux_mode == 2) {
+                       enable_channel1(0);
+                       channel1_intr_enable(0);
                }
                mutex_unlock(&common->lock);
        }
@@ -1694,40 +1696,35 @@ static int vpif_resume(struct device *dev)
                /* Get the pointer to the channel object */
                ch = vpif_obj.dev[i];
                common = &ch->common[VPIF_VIDEO_INDEX];
+
+               if (!vb2_is_streaming(&common->buffer_queue))
+                       continue;
+
                mutex_lock(&common->lock);
-               if (ch->usrs && common->io_usrs) {
-                       /* Disable channel */
-                       if (ch->channel_id == VPIF_CHANNEL0_VIDEO) {
-                               enable_channel0(1);
-                               channel0_intr_enable(1);
-                       }
-                       if (ch->channel_id == VPIF_CHANNEL1_VIDEO ||
-                               ycmux_mode == 2) {
-                               enable_channel1(1);
-                               channel1_intr_enable(1);
-                       }
+               /* Enable channel */
+               if (ch->channel_id == VPIF_CHANNEL0_VIDEO) {
+                       enable_channel0(1);
+                       channel0_intr_enable(1);
+               }
+               if (ch->channel_id == VPIF_CHANNEL1_VIDEO ||
+                       ycmux_mode == 2) {
+                       enable_channel1(1);
+                       channel1_intr_enable(1);
                }
                mutex_unlock(&common->lock);
        }
 
        return 0;
 }
-
-static const struct dev_pm_ops vpif_dev_pm_ops = {
-       .suspend = vpif_suspend,
-       .resume = vpif_resume,
-};
-
-#define vpif_pm_ops (&vpif_dev_pm_ops)
-#else
-#define vpif_pm_ops NULL
 #endif
 
+static SIMPLE_DEV_PM_OPS(vpif_pm_ops, vpif_suspend, vpif_resume);
+
 static __refdata struct platform_driver vpif_driver = {
        .driver = {
                .name   = VPIF_DRIVER_NAME,
                .owner  = THIS_MODULE,
-               .pm     = vpif_pm_ops,
+               .pm     = &vpif_pm_ops,
        },
        .probe = vpif_probe,
        .remove = vpif_remove,

diff --git a/drivers/media/platform/davinci/vpif_capture.h b/drivers/media/platform/davinci/vpif_capture.h
index 4960504a51083163bc6ec0acf8d60bc6afecfae0..ebf2da99cc419f07d1a4aa548ed2aaaa9c4fd686 100644 (file)
--- a/drivers/media/platform/davinci/vpif_capture.h
+++ b/drivers/media/platform/davinci/vpif_capture.h
@@ -75,8 +75,6 @@ struct common_obj {
        spinlock_t irqlock;
        /* lock used to access this structure */
        struct mutex lock;
-       /* number of users performing IO */
-       u32 io_usrs;
        /* Function pointer to set the addresses */
        void (*set_addr) (unsigned long, unsigned long, unsigned long,
                          unsigned long);
@@ -97,8 +95,6 @@ struct common_obj {
 struct channel_obj {
        /* Identifies video device for this channel */
        struct video_device *video_dev;
-       /* number of open instances of the channel */
-       int usrs;
        /* Indicates id of the field which is being displayed */
        u32 field_id;
        /* flag to indicate whether decoder is initialized */