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

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

[media] media: davinci: vpif_display: 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 dcce8669

drivers/media/platform/davinci/vpif_display.c

+30 −34
Original line number Original line Diff line number Diff line
@@ -1124,10 +1124,8 @@ static int vpif_probe_complete(void) 
	for (j = 0; j < VPIF_DISPLAY_MAX_DEVICES; j++) {

	for (j = 0; j < VPIF_DISPLAY_MAX_DEVICES; j++) {

		ch = vpif_obj.dev[j];

		ch = vpif_obj.dev[j];

		/* Initialize field of the channel objects */

		/* Initialize field of the channel objects */

		atomic_set(&ch->usrs, 0);

		for (k = 0; k < VPIF_NUMOBJECTS; k++) {

		for (k = 0; k < VPIF_NUMOBJECTS; k++) {

			common = &ch->common[k];

			common = &ch->common[k];

			common->io_usrs = 0;

			spin_lock_init(&common->irqlock);

			spin_lock_init(&common->irqlock);

			mutex_init(&common->lock);

			mutex_init(&common->lock);

			common->set_addr = NULL;

			common->set_addr = NULL;
@@ -1371,7 +1369,7 @@ static int vpif_remove(struct platform_device *device) 
	return 0;

	return 0;

}

}





#ifdef CONFIG_PM

#ifdef CONFIG_PM_SLEEP

static int vpif_suspend(struct device *dev)

static int vpif_suspend(struct device *dev)

{

{

	struct common_obj *common;

	struct common_obj *common;
@@ -1382,8 +1380,11 @@ static int vpif_suspend(struct device *dev) 
		/* Get the pointer to the channel object */

		/* Get the pointer to the channel object */

		ch = vpif_obj.dev[i];

		ch = vpif_obj.dev[i];

		common = &ch->common[VPIF_VIDEO_INDEX];

		common = &ch->common[VPIF_VIDEO_INDEX];



		if (!vb2_is_streaming(&common->buffer_queue))

			continue;



		mutex_lock(&common->lock);

		mutex_lock(&common->lock);

		if (atomic_read(&ch->usrs) && common->io_usrs) {

		/* Disable channel */

		/* Disable channel */

		if (ch->channel_id == VPIF_CHANNEL2_VIDEO) {

		if (ch->channel_id == VPIF_CHANNEL2_VIDEO) {

			enable_channel2(0);

			enable_channel2(0);
@@ -1394,7 +1395,6 @@ static int vpif_suspend(struct device *dev) 
			enable_channel3(0);

			enable_channel3(0);

			channel3_intr_enable(0);

			channel3_intr_enable(0);

		}

		}

		}

		mutex_unlock(&common->lock);

		mutex_unlock(&common->lock);

	}

	}
@@ -1412,8 +1412,11 @@ static int vpif_resume(struct device *dev) 
		/* Get the pointer to the channel object */

		/* Get the pointer to the channel object */

		ch = vpif_obj.dev[i];

		ch = vpif_obj.dev[i];

		common = &ch->common[VPIF_VIDEO_INDEX];

		common = &ch->common[VPIF_VIDEO_INDEX];



		if (!vb2_is_streaming(&common->buffer_queue))

			continue;



		mutex_lock(&common->lock);

		mutex_lock(&common->lock);

		if (atomic_read(&ch->usrs) && common->io_usrs) {

		/* Enable channel */

		/* Enable channel */

		if (ch->channel_id == VPIF_CHANNEL2_VIDEO) {

		if (ch->channel_id == VPIF_CHANNEL2_VIDEO) {

			enable_channel2(1);

			enable_channel2(1);
@@ -1424,28 +1427,21 @@ static int vpif_resume(struct device *dev) 
			enable_channel3(1);

			enable_channel3(1);

			channel3_intr_enable(1);

			channel3_intr_enable(1);

		}

		}

		}

		mutex_unlock(&common->lock);

		mutex_unlock(&common->lock);

	}

	}





	return 0;

	return 0;

}

}





static const struct dev_pm_ops vpif_pm = {

	.suspend        = vpif_suspend,

	.resume         = vpif_resume,

};



#define vpif_pm_ops (&vpif_pm)

#else

#define vpif_pm_ops NULL

#endif

#endif





static SIMPLE_DEV_PM_OPS(vpif_pm_ops, vpif_suspend, vpif_resume);



static __refdata struct platform_driver vpif_driver = {

static __refdata struct platform_driver vpif_driver = {

	.driver	= {

	.driver	= {

			.name	= VPIF_DRIVER_NAME,

			.name	= VPIF_DRIVER_NAME,

			.owner	= THIS_MODULE,

			.owner	= THIS_MODULE,

			.pm	= vpif_pm_ops,

			.pm	= &vpif_pm_ops,

	},

	},

	.probe	= vpif_probe,

	.probe	= vpif_probe,

	.remove	= vpif_remove,

	.remove	= vpif_remove,

drivers/media/platform/davinci/vpif_display.h

+0 −4
Original line number Original line Diff line number Diff line
@@ -83,8 +83,6 @@ struct common_obj { 
	/* channel specific parameters */

	/* channel specific parameters */

	struct mutex lock;			/* lock used to access this

	struct mutex lock;			/* lock used to access this

						 * structure */

						 * structure */

	u32 io_usrs;				/* number of users performing

						 * IO */

	u32 ytop_off;				/* offset of Y top from the

	u32 ytop_off;				/* offset of Y top from the

						 * starting of the buffer */

						 * starting of the buffer */

	u32 ybtm_off;				/* offset of Y bottom from the

	u32 ybtm_off;				/* offset of Y bottom from the
@@ -104,8 +102,6 @@ struct channel_obj { 
	/* V4l2 specific parameters */

	/* V4l2 specific parameters */

	struct video_device *video_dev;	/* Identifies video device for

	struct video_device *video_dev;	/* Identifies video device for

					 * this channel */

					 * this channel */

	atomic_t usrs;			/* number of open instances of

					 * the channel */

	u32 field_id;			/* Indicates id of the field

	u32 field_id;			/* Indicates id of the field

					 * which is being displayed */

					 * which is being displayed */

	u8 initialized;			/* flag to indicate whether

	u8 initialized;			/* flag to indicate whether