Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b7047713 authored by Lad, Prabhakar's avatar Lad, Prabhakar Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarLad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 7b4657fa

drivers/media/platform/davinci/vpif_capture.c

+30 −33
Original line number Diff line number Diff line
@@ -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,8 +1662,11 @@ 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);
@@ -1674,7 +1677,6 @@ static int vpif_suspend(struct device *dev) 
			enable_channel1(0);

			channel1_intr_enable(0);

		}

		}

		mutex_unlock(&common->lock);

	}
@@ -1694,9 +1696,12 @@ 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 */

		/* Enable channel */

		if (ch->channel_id == VPIF_CHANNEL0_VIDEO) {

			enable_channel0(1);

			channel0_intr_enable(1);
@@ -1706,28 +1711,20 @@ static int vpif_resume(struct device *dev) 
			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,

drivers/media/platform/davinci/vpif_capture.h

+0 −4
Original line number Diff line number Diff line
@@ -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 */