linux-kernel.vger.kernel.org archive mirror
 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 13/36] Staging: cx25821: cx25821-core.c: Change line endings
Date: Sat, 22 Oct 2011 13:43:33 +0800	[thread overview]
Message-ID: <1319262236-6498-14-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-core.c |   48 ++++++++++++++------------------
 1 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/drivers/staging/cx25821/cx25821-core.c b/drivers/staging/cx25821/cx25821-core.c
index f8ead2a..4d99c3c 100644
--- a/drivers/staging/cx25821/cx25821-core.c
+++ b/drivers/staging/cx25821/cx25821-core.c
@@ -804,8 +804,8 @@ void cx25821_set_pixel_format(struct cx25821_dev *dev, int channel_select,
 			      u32 format)
 {
 	if (channel_select <= 7 && channel_select >= 0) {
-		cx_write(dev->channels[channel_select].
-			sram_channels->pix_frmt, format);
+		cx_write(dev->channels[channel_select].sram_channels->pix_frmt,
+				format);
 		dev->channels[channel_select].pixel_formats = format;
 	}
 }
@@ -855,17 +855,15 @@ static void cx25821_initialize(struct cx25821_dev *dev)
 	}
 
 	cx25821_sram_channel_setup_audio(dev,
-				dev->channels[SRAM_CH08].sram_channels,
-				128, 0);
+			dev->channels[SRAM_CH08].sram_channels, 128, 0);
 
 	cx25821_gpio_init(dev);
 }
 
 static int cx25821_get_resources(struct cx25821_dev *dev)
 {
-	if (request_mem_region
-	    (pci_resource_start(dev->pci, 0), pci_resource_len(dev->pci, 0),
-	     dev->name))
+	if (request_mem_region(pci_resource_start(dev->pci, 0),
+				pci_resource_len(dev->pci, 0), dev->name))
 		return 0;
 
 	pr_err("%s: can't get MMIO memory @ 0x%llx\n",
@@ -972,8 +970,7 @@ static int cx25821_dev_setup(struct cx25821_dev *dev)
 	dev->lmmio = ioremap(dev->base_io_addr, pci_resource_len(dev->pci, 0));
 
 	if (!dev->lmmio) {
-		CX25821_ERR
-		    ("ioremap failed, maybe increasing __VMALLOC_RESERVE in page.h\n");
+		CX25821_ERR("ioremap failed, maybe increasing __VMALLOC_RESERVE in page.h\n");
 		cx25821_iounmap(dev);
 		return -ENOMEM;
 	}
@@ -1004,9 +1001,8 @@ static int cx25821_dev_setup(struct cx25821_dev *dev)
 	cx25821_video_register(dev);
 
 	/* register IOCTL device */
-	dev->ioctl_dev =
-	   cx25821_vdev_init(dev, dev->pci, &cx25821_videoioctl_template,
-			      "video");
+	dev->ioctl_dev = cx25821_vdev_init(dev, dev->pci,
+			&cx25821_videoioctl_template, "video");
 
 	if (video_register_device
 	    (dev->ioctl_dev, VFL_TYPE_GRABBER, VIDEO_IOCTL_CH) < 0) {
@@ -1103,16 +1099,15 @@ static __le32 *cx25821_risc_field(__le32 * rp, struct scatterlist *sglist,
 		}
 		if (bpl <= sg_dma_len(sg) - offset) {
 			/* fits into current chunk */
-			*(rp++) =
-			    cpu_to_le32(RISC_WRITE | RISC_SOL | RISC_EOL | bpl);
+			*(rp++) = cpu_to_le32(RISC_WRITE | RISC_SOL | RISC_EOL |
+					bpl);
 			*(rp++) = cpu_to_le32(sg_dma_address(sg) + offset);
 			*(rp++) = cpu_to_le32(0);	/* bits 63-32 */
 			offset += bpl;
 		} else {
 			/* scanline needs to be split */
 			todo = bpl;
-			*(rp++) =
-			    cpu_to_le32(RISC_WRITE | RISC_SOL |
+			*(rp++) = cpu_to_le32(RISC_WRITE | RISC_SOL |
 					(sg_dma_len(sg) - offset));
 			*(rp++) = cpu_to_le32(sg_dma_address(sg) + offset);
 			*(rp++) = cpu_to_le32(0);	/* bits 63-32 */
@@ -1120,8 +1115,8 @@ static __le32 *cx25821_risc_field(__le32 * rp, struct scatterlist *sglist,
 			offset = 0;
 			sg++;
 			while (todo > sg_dma_len(sg)) {
-				*(rp++) =
-				    cpu_to_le32(RISC_WRITE | sg_dma_len(sg));
+				*(rp++) = cpu_to_le32(RISC_WRITE |
+						sg_dma_len(sg));
 				*(rp++) = cpu_to_le32(sg_dma_address(sg));
 				*(rp++) = cpu_to_le32(0);	/* bits 63-32 */
 				todo -= sg_dma_len(sg);
@@ -1160,8 +1155,8 @@ int cx25821_risc_buffer(struct pci_dev *pci, struct btcx_riscmem *risc,
 	   can cause next bpl to start close to a page border.  First DMA
 	   region may be smaller than PAGE_SIZE */
 	/* write and jump need and extra dword */
-	instructions =
-	    fields * (1 + ((bpl + padding) * lines) / PAGE_SIZE + lines);
+	instructions = fields * (1 + ((bpl + padding) * lines) / PAGE_SIZE +
+			lines);
 	instructions += 2;
 	rc = btcx_riscmem_alloc(pci, risc, instructions * 12);
 
@@ -1215,8 +1210,8 @@ static __le32 *cx25821_risc_field_audio(__le32 * rp, struct scatterlist *sglist,
 
 		if (bpl <= sg_dma_len(sg) - offset) {
 			/* fits into current chunk */
-			*(rp++) =
-			    cpu_to_le32(RISC_WRITE | sol | RISC_EOL | bpl);
+			*(rp++) = cpu_to_le32(RISC_WRITE | sol | RISC_EOL |
+					bpl);
 			*(rp++) = cpu_to_le32(sg_dma_address(sg) + offset);
 			*(rp++) = cpu_to_le32(0);	/* bits 63-32 */
 			offset += bpl;
@@ -1339,8 +1334,8 @@ static irqreturn_t cx25821_irq(int irq, void *dev_id)
 				sram_channels->int_stat);
 
 			if (vid_status)
-				handled +=
-				cx25821_video_irq(dev, i, vid_status);
+				handled += cx25821_video_irq(dev, i,
+						vid_status);
 
 			cx_write(PCI_INT_STAT, mask[i]);
 		}
@@ -1427,9 +1422,8 @@ static int __devinit cx25821_initdev(struct pci_dev *pci_dev,
 		goto fail_irq;
 	}
 
-	err =
-	    request_irq(pci_dev->irq, cx25821_irq, IRQF_SHARED | IRQF_DISABLED,
-			dev->name, dev);
+	err = request_irq(pci_dev->irq, cx25821_irq,
+			IRQF_SHARED | IRQF_DISABLED, dev->name, dev);
 
 	if (err < 0) {
 		pr_err("%s: can't get IRQ %d\n", dev->name, pci_dev->irq);
-- 
1.7.0.4


  parent reply	other threads:[~2011-10-22  5:47 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 ` Leonid V. Fedorenchik [this message]
2011-10-22  5:43 ` [PATCH 14/36] Staging: cx25821: cx25821-i2c.c: Change line endings 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 ` [PATCH 35/36] Staging: cx25821: cx25821-video.c: Change line endings Leonid V. Fedorenchik
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-14-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;
as well as URLs for NNTP newsgroup(s).