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

Commit 89f3a142 authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] saa7134: move qos_request from saa7134_fh to saa7134_dev 



This is a global field, not a per-filehandle field.

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 813b9dff

drivers/media/pci/saa7134/saa7134-video.c

+2 −2
Original line number Diff line number Diff line
@@ -2205,7 +2205,7 @@ static int saa7134_streamon(struct file *file, void *priv, 
	 * Unfortunately, I lack register-level documentation to check the

	 * Linux FIFO setup and confirm the perfect value.

	 */

	pm_qos_add_request(&fh->qos_request,

	pm_qos_add_request(&dev->qos_request,

			   PM_QOS_CPU_DMA_LATENCY,

			   20);
@@ -2220,7 +2220,7 @@ static int saa7134_streamoff(struct file *file, void *priv, 
	struct saa7134_dev *dev = fh->dev;

	int res = saa7134_resource(file);



	pm_qos_remove_request(&fh->qos_request);

	pm_qos_remove_request(&dev->qos_request);



	err = videobuf_streamoff(saa7134_queue(file));

	if (err < 0)

drivers/media/pci/saa7134/saa7134.h

+1 −1
Original line number Diff line number Diff line
@@ -472,7 +472,6 @@ struct saa7134_fh { 
	struct v4l2_fh             fh;

	struct saa7134_dev         *dev;

	unsigned int               resources;

	struct pm_qos_request	   qos_request;



	/* video capture */

	struct videobuf_queue      cap;
@@ -595,6 +594,7 @@ struct saa7134_dev { 
	unsigned int               vbi_fieldcount;

	struct saa7134_format      *fmt;

	unsigned int               width, height;

	struct pm_qos_request	   qos_request;



	/* various v4l controls */

	struct saa7134_tvnorm      *tvnorm;              /* video */