All of lore.kernel.org
 help / color / mirror / Atom feed
From: Magnus Damm <magnus.damm@gmail.com>
To: video4linux-list@redhat.com
Cc: akpm@linux-foundation.org, lethal@linux-sh.org,
	mchehab@infradead.org, linux-sh@vger.kernel.org
Subject: [PATCH 04/07] soc_camera: Remove unused file lock pointer
Date: Tue, 01 Jul 2008 12:47:16 +0000	[thread overview]
Message-ID: <20080701124716.30446.82032.sendpatchset@rx1.opensource.se> (raw)
In-Reply-To: <20080701124638.30446.81449.sendpatchset@rx1.opensource.se>

This icf->lock pointer is not needed anymore since we now let the
soc_camera host setup the videobuf queue.

Signed-off-by: Magnus Damm <damm@igel.co.jp>
---

 drivers/media/video/pxa_camera.c |    4 +---
 drivers/media/video/soc_camera.c |    2 --
 include/media/soc_camera.h       |    1 -
 3 files changed, 1 insertion(+), 6 deletions(-)

--- 0008/drivers/media/video/pxa_camera.c
+++ work/drivers/media/video/pxa_camera.c	2008-06-12 14:36:07.000000000 +0900
@@ -990,12 +990,10 @@ static int pxa_camera_file_alloc(struct 
 		to_soc_camera_host(icf->icd->dev.parent);
 	struct pxa_camera_dev *pcdev = ici->priv;
 
-	icf->lock = &pcdev->lock;
-
 	/* We must pass NULL as dev pointer, then all pci_* dma operations
 	 * transform to normal dma_* ones. */
 	videobuf_queue_sg_init(&icf->vb_vidq, &pxa_videobuf_ops,
-			       NULL, icf->lock,
+			       NULL, &pcdev->lock,
 			       V4L2_BUF_TYPE_VIDEO_CAPTURE, V4L2_FIELD_NONE,
 			       sizeof(struct pxa_buffer), icf->icd);
 	return 0;
--- 0007/drivers/media/video/soc_camera.c
+++ work/drivers/media/video/soc_camera.c	2008-06-12 14:37:33.000000000 +0900
@@ -236,7 +236,6 @@ static int soc_camera_open(struct inode 
 eiciadd:
 	if (ici->ops->file_free)
 		ici->ops->file_free(icf);
-	icf->lock = NULL;
 esla:
 	module_put(ici->ops->owner);
 emgi:
@@ -260,7 +259,6 @@ static int soc_camera_close(struct inode
 		ici->ops->remove(icd);
 	if (ici->ops->file_free)
 		ici->ops->file_free(icf);
-	icf->lock = NULL;
 	module_put(icd->ops->owner);
 	module_put(ici->ops->owner);
 	mutex_unlock(&video_lock);
--- 0008/include/media/soc_camera.h
+++ work/include/media/soc_camera.h	2008-06-12 14:35:21.000000000 +0900
@@ -48,7 +48,6 @@ struct soc_camera_device {
 struct soc_camera_file {
 	struct soc_camera_device *icd;
 	struct videobuf_queue vb_vidq;
-	spinlock_t *lock;
 };
 
 struct soc_camera_host {

WARNING: multiple messages have this Message-ID (diff)
From: Magnus Damm <magnus.damm@gmail.com>
To: video4linux-list@redhat.com
Cc: akpm@linux-foundation.org, lethal@linux-sh.org,
	mchehab@infradead.org, linux-sh@vger.kernel.org
Subject: [PATCH 04/07] soc_camera: Remove unused file lock pointer
Date: Tue, 01 Jul 2008 21:47:16 +0900	[thread overview]
Message-ID: <20080701124716.30446.82032.sendpatchset@rx1.opensource.se> (raw)
In-Reply-To: <20080701124638.30446.81449.sendpatchset@rx1.opensource.se>

This icf->lock pointer is not needed anymore since we now let the
soc_camera host setup the videobuf queue.

Signed-off-by: Magnus Damm <damm@igel.co.jp>
---

 drivers/media/video/pxa_camera.c |    4 +---
 drivers/media/video/soc_camera.c |    2 --
 include/media/soc_camera.h       |    1 -
 3 files changed, 1 insertion(+), 6 deletions(-)

--- 0008/drivers/media/video/pxa_camera.c
+++ work/drivers/media/video/pxa_camera.c	2008-06-12 14:36:07.000000000 +0900
@@ -990,12 +990,10 @@ static int pxa_camera_file_alloc(struct 
 		to_soc_camera_host(icf->icd->dev.parent);
 	struct pxa_camera_dev *pcdev = ici->priv;
 
-	icf->lock = &pcdev->lock;
-
 	/* We must pass NULL as dev pointer, then all pci_* dma operations
 	 * transform to normal dma_* ones. */
 	videobuf_queue_sg_init(&icf->vb_vidq, &pxa_videobuf_ops,
-			       NULL, icf->lock,
+			       NULL, &pcdev->lock,
 			       V4L2_BUF_TYPE_VIDEO_CAPTURE, V4L2_FIELD_NONE,
 			       sizeof(struct pxa_buffer), icf->icd);
 	return 0;
--- 0007/drivers/media/video/soc_camera.c
+++ work/drivers/media/video/soc_camera.c	2008-06-12 14:37:33.000000000 +0900
@@ -236,7 +236,6 @@ static int soc_camera_open(struct inode 
 eiciadd:
 	if (ici->ops->file_free)
 		ici->ops->file_free(icf);
-	icf->lock = NULL;
 esla:
 	module_put(ici->ops->owner);
 emgi:
@@ -260,7 +259,6 @@ static int soc_camera_close(struct inode
 		ici->ops->remove(icd);
 	if (ici->ops->file_free)
 		ici->ops->file_free(icf);
-	icf->lock = NULL;
 	module_put(icd->ops->owner);
 	module_put(ici->ops->owner);
 	mutex_unlock(&video_lock);
--- 0008/include/media/soc_camera.h
+++ work/include/media/soc_camera.h	2008-06-12 14:35:21.000000000 +0900
@@ -48,7 +48,6 @@ struct soc_camera_device {
 struct soc_camera_file {
 	struct soc_camera_device *icd;
 	struct videobuf_queue vb_vidq;
-	spinlock_t *lock;
 };
 
 struct soc_camera_host {

--
video4linux-list mailing list
Unsubscribe mailto:video4linux-list-request@redhat.com?subject=unsubscribe
https://www.redhat.com/mailman/listinfo/video4linux-list

  parent reply	other threads:[~2008-07-01 12:47 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-07-01 12:46 [PATCH 00/07] soc_camera: SuperH Mobile CEU support Magnus Damm
2008-07-01 12:46 ` Magnus Damm
2008-07-01 12:46 ` [PATCH 01/07] soc_camera: Remove default spinlock operations Magnus Damm
2008-07-01 12:46   ` Magnus Damm
2008-07-01 12:46 ` [PATCH 02/07] soc_camera: Let the host select videobuf_queue type Magnus Damm
2008-07-01 12:46   ` Magnus Damm
2008-07-01 20:02   ` [PATCH 02/07] soc_camera: Let the host select videobuf_queue Guennadi Liakhovetski
2008-07-01 20:02     ` [PATCH 02/07] soc_camera: Let the host select videobuf_queue type Guennadi Liakhovetski
2008-07-02  2:50     ` Magnus Damm
2008-07-02  2:50       ` Magnus Damm
2008-07-02  7:27   ` [PATCH 02/07] soc_camera: Let the host select videobuf_queue Paulius Zaleckas
2008-07-02  7:27     ` [PATCH 02/07] soc_camera: Let the host select videobuf_queue type Paulius Zaleckas
2008-07-01 12:47 ` [PATCH 03/07] soc_camera: Remove vbq_ops and msize Magnus Damm
2008-07-01 12:47   ` Magnus Damm
2008-07-01 12:47 ` Magnus Damm [this message]
2008-07-01 12:47   ` [PATCH 04/07] soc_camera: Remove unused file lock pointer Magnus Damm
2008-07-01 12:47 ` [PATCH 05/07] soc_camera: Add 16-bit bus width support Magnus Damm
2008-07-01 12:47   ` Magnus Damm
2008-07-01 12:47 ` [PATCH 06/07] videobuf: Add physically contiguous queue code Magnus Damm
2008-07-01 12:47   ` Magnus Damm
2008-07-02  7:43   ` Paulius Zaleckas
2008-07-02  7:43     ` Paulius Zaleckas
     [not found]     ` <aec7e5c30807020232j1181ba9s43bc0e6920b18733@mail.gmail.com>
2008-07-02 10:42       ` Paulius Zaleckas
2008-07-02 10:42         ` Paulius Zaleckas
2008-07-04  9:08   ` Paulius Zaleckas
2008-07-04  9:08     ` Paulius Zaleckas
2008-07-01 12:47 ` [PATCH 07/07] sh_mobile_ceu_camera: Add SuperH Mobile CEU driver Magnus Damm
2008-07-01 12:47   ` Magnus Damm
2008-07-01 20:07   ` Guennadi Liakhovetski
2008-07-01 20:07     ` Guennadi Liakhovetski
2008-07-02  3:08     ` Magnus Damm
2008-07-02  3:08       ` Magnus Damm

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080701124716.30446.82032.sendpatchset@rx1.opensource.se \
    --to=magnus.damm@gmail.com \
    --cc=akpm@linux-foundation.org \
    --cc=lethal@linux-sh.org \
    --cc=linux-sh@vger.kernel.org \
    --cc=mchehab@infradead.org \
    --cc=video4linux-list@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.