mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Leonid V. Fedorenchik" <leonidsbox@gmail.com>
To: Greg Kroah-Hartman <gregkh@suse.de>
Cc: Mauro Carvalho Chehab <mchehab@redhat.com>,
	Namhyung Kim <namhyung@gmail.com>,
	Palash Bandyopadhyay <palash.bandyopadhyay@conexant.com>,
	Joe Perches <joe@perches.com>, Ilia Mirkin <imirkin@alum.mit.edu>,
	Youquan Song <youquan.song@intel.com>,
	"Leonid V. Fedorenchik" <leonidsbox@gmail.com>,
	devel@linuxdriverproject.org, linux-kernel@vger.kernel.org
Subject: [PATCH 35/36] Staging: cx25821: cx25821-video.c: Change line endings
Date: Sat, 22 Oct 2011 13:43:55 +0800	[thread overview]
Message-ID: <1319262236-6498-36-git-send-email-leonidsbox@gmail.com> (raw)
In-Reply-To: <1319262236-6498-1-git-send-email-leonidsbox@gmail.com>

Change obscure line endings to less obscure ones. (improve readability)

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
---
 drivers/staging/cx25821/cx25821-video.c |   47 ++++++++++++++----------------
 1 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/drivers/staging/cx25821/cx25821-video.c b/drivers/staging/cx25821/cx25821-video.c
index bc6af41..e9dd999 100644
--- a/drivers/staging/cx25821/cx25821-video.c
+++ b/drivers/staging/cx25821/cx25821-video.c
@@ -140,8 +140,8 @@ void cx25821_video_wakeup(struct cx25821_dev *dev, struct cx25821_dmaqueue *q,
 			break;
 		}
 
-		buf =
-		    list_entry(q->active.next, struct cx25821_buffer, vb.queue);
+		buf = list_entry(q->active.next, struct cx25821_buffer,
+				vb.queue);
 
 		/* count comes from the hw and it is 16bit wide --
 		 * this trick handles wrap-arounds correctly for
@@ -318,8 +318,8 @@ int cx25821_restart_video_queue(struct cx25821_dev *dev,
 	struct list_head *item;
 
 	if (!list_empty(&q->active)) {
-		buf =
-		    list_entry(q->active.next, struct cx25821_buffer, vb.queue);
+		buf = list_entry(q->active.next, struct cx25821_buffer,
+				vb.queue);
 
 		cx25821_start_video_dma(dev, q, buf, channel);
 
@@ -337,8 +337,8 @@ int cx25821_restart_video_queue(struct cx25821_dev *dev,
 		if (list_empty(&q->queued))
 			return 0;
 
-		buf =
-		    list_entry(q->queued.next, struct cx25821_buffer, vb.queue);
+		buf = list_entry(q->queued.next, struct cx25821_buffer,
+				vb.queue);
 
 		if (NULL == prev) {
 			list_move_tail(&buf->vb.queue, &q->active);
@@ -375,8 +375,8 @@ void cx25821_vid_timeout(unsigned long data)
 
 	spin_lock_irqsave(&dev->slock, flags);
 	while (!list_empty(&q->active)) {
-		buf =
-		    list_entry(q->active.next, struct cx25821_buffer, vb.queue);
+		buf = list_entry(q->active.next, struct cx25821_buffer,
+				vb.queue);
 		list_del(&buf->vb.queue);
 
 		buf->vb.state = VIDEOBUF_ERROR;
@@ -498,15 +498,14 @@ int cx25821_video_register(struct cx25821_dev *dev)
 		dev->channels[i].timeout_data.dev = dev;
 		dev->channels[i].timeout_data.channel =
 			&cx25821_sram_channels[i];
-		dev->channels[i].vidq.timeout.function =
-			cx25821_vid_timeout;
+		dev->channels[i].vidq.timeout.function = cx25821_vid_timeout;
 		dev->channels[i].vidq.timeout.data =
 			(unsigned long)&dev->channels[i].timeout_data;
 		init_timer(&dev->channels[i].vidq.timeout);
 
 		/* register v4l devices */
-		dev->channels[i].video_dev = cx25821_vdev_init(dev,
-				dev->pci, &cx25821_video_device, "video");
+		dev->channels[i].video_dev = cx25821_vdev_init(dev, dev->pci,
+				&cx25821_video_device, "video");
 
 		err = video_register_device(dev->channels[i].video_dev,
 				VFL_TYPE_GRABBER, video_nr[dev->nr]);
@@ -619,10 +618,9 @@ int cx25821_buffer_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,
 					    dev->tvnorm & V4L2_STD_PAL_DK)
 						bpl_local = 352 << 1;
 					else
-						bpl_local =
-						 dev->channels[channel_opened].
-						 cif_width <<
-						 1;
+						bpl_local = dev->channels[
+							channel_opened].
+							cif_width << 1;
 				}
 			}
 		}
@@ -846,11 +844,10 @@ static int video_open(struct file *file)
 
 	v4l2_prio_open(&dev->channels[ch_id].prio, &fh->prio);
 
-	videobuf_queue_sg_init(&fh->vidq, &cx25821_video_qops,
-			      &dev->pci->dev, &dev->slock,
-			      V4L2_BUF_TYPE_VIDEO_CAPTURE,
-			      V4L2_FIELD_INTERLACED,
-			      sizeof(struct cx25821_buffer), fh, NULL);
+	videobuf_queue_sg_init(&fh->vidq, &cx25821_video_qops, &dev->pci->dev,
+			&dev->slock, V4L2_BUF_TYPE_VIDEO_CAPTURE,
+			V4L2_FIELD_INTERLACED, sizeof(struct cx25821_buffer),
+			fh, NULL);
 
 	dprintk(1, "post videobuf_queue_init()\n");
 	mutex_unlock(&cx25821_devlist_mutex);
@@ -1166,8 +1163,8 @@ int cx25821_vidioc_querycap(struct file *file, void *priv,
 	strlcpy(cap->card, cx25821_boards[dev->board].name, sizeof(cap->card));
 	sprintf(cap->bus_info, "PCIe:%s", pci_name(dev->pci));
 	cap->version = CX25821_VERSION_CODE;
-	cap->capabilities =
-	    V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE | V4L2_CAP_STREAMING;
+	cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE |
+		V4L2_CAP_STREAMING;
 	if (UNSET != dev->tuner_type)
 		cap->capabilities |= V4L2_CAP_TUNER;
 	return 0;
@@ -1897,8 +1894,8 @@ static long video_ioctl_set(struct file *file, unsigned int cmd,
 		}
 
 		if (selected_channel <= 7 && selected_channel >= 0) {
-			dev->channels[selected_channel].
-				use_cif_resolution = cif_enable;
+			dev->channels[selected_channel].use_cif_resolution =
+				cif_enable;
 			dev->channels[selected_channel].cif_width = width;
 		} else {
 			for (i = 0; i < VID_CHANNEL_NUM; i++) {
-- 
1.7.0.4


  parent reply	other threads:[~2011-10-22  5:50 UTC|newest]

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-10-22  5:43 [PATCH 00/36] Staging: cx25821: Clean up patch series Leonid V. Fedorenchik
2011-10-22  5:43 ` [PATCH 01/36] Staging: cx25821: cx25821-alsa.c: Line up comments Leonid V. Fedorenchik
2011-10-22  5:43 ` [PATCH 02/36] Staging: cx25821: cx25821-alsa.c: Add braces to else clause Leonid V. Fedorenchik
2011-10-22  5:43 ` [PATCH 03/36] Staging: cx25821: cx25821-alsa.c: Fix indent Leonid V. Fedorenchik
2011-10-22  5:43 ` [PATCH 04/36] Staging: cx25821: cx25821-alsa.c: Change line endings Leonid V. Fedorenchik
2011-10-22  5:43 ` [PATCH 05/36] Staging: cx25821: cx25821-audio-upstream.c: Fix indent Leonid V. Fedorenchik
2011-10-22  5:43 ` [PATCH 06/36] Staging: cx25821: cx25821-audio-upstream.c: Move operators Leonid V. Fedorenchik
2011-10-22  5:43 ` [PATCH 07/36] Staging: cx25821: cx25821-audio-upstream.c: Change line endings Leonid V. Fedorenchik
2011-10-22  5:43 ` [PATCH 08/36] Staging: cx25821: cx25821-audio.h: Line up defines Leonid V. Fedorenchik
2011-10-22  5:43 ` [PATCH 09/36] Staging: cx25821: cx25821-audio.h: Fix multiline defines Leonid V. Fedorenchik
2011-10-22  5:43 ` [PATCH 10/36] Staging: cx25821: cx25821-cards.c: Fix indent Leonid V. Fedorenchik
2011-10-22  5:43 ` [PATCH 11/36] Staging: cx25821: cx25821-core.c: Delete empty line Leonid V. Fedorenchik
2011-10-22  5:43 ` [PATCH 12/36] Staging: cx25821: cx25821-core.c: Fix indent Leonid V. Fedorenchik
2011-10-22  5:43 ` [PATCH 13/36] Staging: cx25821: cx25821-core.c: Change line endings Leonid V. Fedorenchik
2011-10-22  5:43 ` [PATCH 14/36] Staging: cx25821: cx25821-i2c.c: " Leonid V. Fedorenchik
2011-10-22  5:43 ` [PATCH 15/36] Staging: cx25821: cx25821-medusa-defines.h: Fix typo Leonid V. Fedorenchik
2011-10-22  5:43 ` [PATCH 16/36] Staging: cx25821: cx25821-medusa-defines.h: Line up defines Leonid V. Fedorenchik
2011-10-22  5:43 ` [PATCH 17/36] Staging: cx25821: cx25821-medusa-reg.h: " Leonid V. Fedorenchik
2011-10-22  5:43 ` [PATCH 18/36] Staging: cx25821: cx25821-medusa-video.c: Fix comment Leonid V. Fedorenchik
2011-10-22  5:43 ` [PATCH 19/36] Staging: cx25821: cx25821-medusa-video.c: Move operators Leonid V. Fedorenchik
2011-10-22  5:43 ` [PATCH 20/36] Staging: cx25821: cx25821-medusa-video.c: Change line endings Leonid V. Fedorenchik
2011-10-22  5:43 ` [PATCH 21/36] Staging: cx25821: cx25821-video-upstream-ch2.c: Line up comments Leonid V. Fedorenchik
2011-10-22  5:43 ` [PATCH 22/36] Staging: cx25821: cx25821-video-upstream-ch2.c: Fix indent Leonid V. Fedorenchik
2011-10-22  5:43 ` [PATCH 23/36] Staging: cx25821: cx25821-video-upsstream-ch2.c: Move operators Leonid V. Fedorenchik
2011-10-22  5:43 ` [PATCH 24/36] Staging: cx25821: cx25821-video-upstream-ch2.c: Remove braces Leonid V. Fedorenchik
2011-10-22  5:43 ` [PATCH 25/36] Staging: cx25821: cx25821-video-upstream-ch2.c: Change line endings Leonid V. Fedorenchik
2011-10-22  5:43 ` [PATCH 26/36] Staging: cx25821: cx25821-video-upstream.c: Remove braces Leonid V. Fedorenchik
2011-10-22  5:43 ` [PATCH 27/36] Staging: cx25821: cx25821-video-upstream.c: Fix indent Leonid V. Fedorenchik
2011-10-22  5:43 ` [PATCH 28/36] Staging: cx25821: cx25821-video-upstream.c: Change line endings Leonid V. Fedorenchik
2011-10-22  5:43 ` [PATCH 29/36] Staging: cx25821: cx25821-video.c: Delete empty line Leonid V. Fedorenchik
2011-10-22  5:43 ` [PATCH 30/36] Staging: cx25821: cx25821-video.c: Change spaces Leonid V. Fedorenchik
2011-10-22  5:43 ` [PATCH 31/36] Staging: cx25821: cx25821-video.c: Fix assignment Leonid V. Fedorenchik
2011-10-22  5:43 ` [PATCH 32/36] Staging: cx25821: cx25821-video.c: Fix definitions Leonid V. Fedorenchik
2011-10-22  5:43 ` [PATCH 33/36] Staging: cx25821: cx25821-video.c: Move operators Leonid V. Fedorenchik
2011-10-22  5:43 ` [PATCH 34/36] Staging: cx25821: cx25821-video.c: Fix indent Leonid V. Fedorenchik
2011-10-22  5:43 ` Leonid V. Fedorenchik [this message]
2011-10-22  5:43 ` [PATCH 36/36] Staging: cx25821: cx25821.h: Line up defines Leonid V. Fedorenchik
2011-10-22  8:19 ` [PATCH 00/36] Staging: cx25821: Clean up patch series Greg KH
2011-10-23  5:36   ` Mauro Carvalho Chehab
2011-10-23 15:24     ` Leonid V. Fedorenchik
2011-10-23 20:45       ` Mauro Carvalho Chehab
2011-10-24 14:46         ` Leonid V. Fedorenchik
2011-10-24 15:49           ` [PATCH] MAINTAINERS: Staging: cx25821: Add L: linux-media Joe Perches
2011-11-19  6:28     ` [PATCH 00/36] Staging: cx25821: Clean up patch series Leonid V. Fedorenchik
2011-11-24 20:42       ` Mauro Carvalho Chehab
2011-11-25 11:29         ` Leonid V. Fedorenchik
2011-10-22 12:50 ` Palash Bandyopadhyay
2011-10-23 15:20   ` Leonid V. Fedorenchik

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=1319262236-6498-36-git-send-email-leonidsbox@gmail.com \
    --to=leonidsbox@gmail.com \
    --cc=devel@linuxdriverproject.org \
    --cc=gregkh@suse.de \
    --cc=imirkin@alum.mit.edu \
    --cc=joe@perches.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mchehab@redhat.com \
    --cc=namhyung@gmail.com \
    --cc=palash.bandyopadhyay@conexant.com \
    --cc=youquan.song@intel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

Powered by JetHome