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 04/36] Staging: cx25821: cx25821-alsa.c: Change line endings
Date: Sat, 22 Oct 2011 13:43:24 +0800	[thread overview]
Message-ID: <1319262236-6498-5-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-alsa.c |   52 +++++++++++++-------------------
 1 files changed, 21 insertions(+), 31 deletions(-)

diff --git a/drivers/staging/cx25821/cx25821-alsa.c b/drivers/staging/cx25821/cx25821-alsa.c
index e700365..00fda93 100644
--- a/drivers/staging/cx25821/cx25821-alsa.c
+++ b/drivers/staging/cx25821/cx25821-alsa.c
@@ -176,8 +176,7 @@ static int _cx25821_start_audio_dma(struct cx25821_audio_dev *chip)
 
 	/* Set the input mode to 16-bit */
 	tmp = cx_read(AUD_A_CFG);
-	cx_write(AUD_A_CFG,
-		 tmp | FLD_AUD_DST_PK_MODE | FLD_AUD_DST_ENABLE |
+	cx_write(AUD_A_CFG, tmp | FLD_AUD_DST_PK_MODE | FLD_AUD_DST_ENABLE |
 		 FLD_AUD_CLK_ENABLE);
 
 	/*
@@ -188,9 +187,8 @@ static int _cx25821_start_audio_dma(struct cx25821_audio_dev *chip)
 	*/
 
 	/* Enables corresponding bits at AUD_INT_STAT */
-	cx_write(AUD_A_INT_MSK,
-		 FLD_AUD_DST_RISCI1 | FLD_AUD_DST_OF | FLD_AUD_DST_SYNC |
-		 FLD_AUD_DST_OPC_ERR);
+	cx_write(AUD_A_INT_MSK, FLD_AUD_DST_RISCI1 | FLD_AUD_DST_OF |
+		 FLD_AUD_DST_SYNC | FLD_AUD_DST_OPC_ERR);
 
 	/* Clean any pending interrupt bits already set */
 	cx_write(AUD_A_INT_STAT, ~0);
@@ -200,8 +198,8 @@ static int _cx25821_start_audio_dma(struct cx25821_audio_dev *chip)
 
 	/* Turn on audio downstream fifo and risc enable 0x101 */
 	tmp = cx_read(AUD_INT_DMA_CTL);
-	cx_set(AUD_INT_DMA_CTL,
-	       tmp | (FLD_AUD_DST_A_RISC_EN | FLD_AUD_DST_A_FIFO_EN));
+	cx_set(AUD_INT_DMA_CTL, tmp |
+	       (FLD_AUD_DST_A_RISC_EN | FLD_AUD_DST_A_FIFO_EN));
 
 	mdelay(100);
 	return 0;
@@ -220,9 +218,8 @@ static int _cx25821_stop_audio_dma(struct cx25821_audio_dev *chip)
 
 	/* disable irqs */
 	cx_clear(PCI_INT_MSK, PCI_MSK_AUD_INT);
-	cx_clear(AUD_A_INT_MSK,
-		 AUD_INT_OPC_ERR | AUD_INT_DN_SYNC | AUD_INT_DN_RISCI2 |
-		 AUD_INT_DN_RISCI1);
+	cx_clear(AUD_A_INT_MSK, AUD_INT_OPC_ERR | AUD_INT_DN_SYNC |
+		 AUD_INT_DN_RISCI2 | AUD_INT_DN_RISCI1);
 
 	return 0;
 }
@@ -258,10 +255,8 @@ static void cx25821_aud_irq(struct cx25821_audio_dev *chip, u32 status,
 
 	cx_write(AUD_A_INT_STAT, status);
 	if (debug > 1 || (status & mask & ~0xff))
-		cx25821_print_irqbits(dev->name, "irq aud",
-				      cx25821_aud_irqs,
-				      ARRAY_SIZE(cx25821_aud_irqs), status,
-				      mask);
+		cx25821_print_irqbits(dev->name, "irq aud", cx25821_aud_irqs,
+				ARRAY_SIZE(cx25821_aud_irqs), status, mask);
 
 	/* risc op code error */
 	if (status & AUD_INT_OPC_ERR) {
@@ -270,8 +265,7 @@ static void cx25821_aud_irq(struct cx25821_audio_dev *chip, u32 status,
 		cx_clear(AUD_INT_DMA_CTL,
 			 FLD_AUD_DST_A_RISC_EN | FLD_AUD_DST_A_FIFO_EN);
 		cx25821_sram_channel_dump_audio(dev,
-						&cx25821_sram_channels
-						[AUDIO_SRAM_CHANNEL]);
+				&cx25821_sram_channels[AUDIO_SRAM_CHANNEL]);
 	}
 	if (status & AUD_INT_DN_SYNC) {
 		pr_warn("WARNING %s: Downstream sync error!\n", dev->name);
@@ -362,9 +356,8 @@ static int dsp_buffer_free(struct cx25821_audio_dev *chip)
  */
 #define DEFAULT_FIFO_SIZE	384
 static struct snd_pcm_hardware snd_cx25821_digital_hw = {
-	.info = SNDRV_PCM_INFO_MMAP |
-	    SNDRV_PCM_INFO_INTERLEAVED |
-	    SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_MMAP_VALID,
+	.info = SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
+		SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_MMAP_VALID,
 	.formats = SNDRV_PCM_FMTBIT_S16_LE,
 
 	.rates = SNDRV_PCM_RATE_48000,
@@ -397,8 +390,8 @@ static int snd_cx25821_pcm_open(struct snd_pcm_substream *substream)
 		return -ENODEV;
 	}
 
-	err =
-	    snd_pcm_hw_constraint_pow2(runtime, 0, SNDRV_PCM_HW_PARAM_PERIODS);
+	err = snd_pcm_hw_constraint_pow2(runtime, 0,
+					 SNDRV_PCM_HW_PARAM_PERIODS);
 	if (err < 0)
 		goto _error;
 
@@ -469,8 +462,7 @@ static int snd_cx25821_hw_params(struct snd_pcm_substream *substream,
 	dma = &buf->dma;
 	videobuf_dma_init(dma);
 	ret = videobuf_dma_init_kernel(dma, PCI_DMA_FROMDEVICE,
-				       (PAGE_ALIGN(chip->dma_size) >>
-					PAGE_SHIFT));
+			(PAGE_ALIGN(chip->dma_size) >> PAGE_SHIFT));
 	if (ret < 0)
 		goto error;
 
@@ -478,10 +470,8 @@ static int snd_cx25821_hw_params(struct snd_pcm_substream *substream,
 	if (ret < 0)
 		goto error;
 
-	ret =
-	    cx25821_risc_databuffer_audio(chip->pci, &buf->risc, dma->sglist,
-					  chip->period_size, chip->num_periods,
-					  1);
+	ret = cx25821_risc_databuffer_audio(chip->pci, &buf->risc, dma->sglist,
+			chip->period_size, chip->num_periods, 1);
 	if (ret < 0) {
 		pr_info("DEBUG: ERROR after cx25821_risc_databuffer_audio()\n");
 		goto error;
@@ -712,8 +702,8 @@ static int cx25821_audio_initdev(struct cx25821_dev *dev)
 			  IRQF_SHARED | IRQF_DISABLED, chip->dev->name, chip);
 
 	if (err < 0) {
-		pr_err("ERROR %s: can't get IRQ %d for ALSA\n",
-		       chip->dev->name, dev->pci->irq);
+		pr_err("ERROR %s: can't get IRQ %d for ALSA\n", chip->dev->name,
+			dev->pci->irq);
 		goto error;
 	}
 
@@ -731,8 +721,8 @@ static int cx25821_audio_initdev(struct cx25821_dev *dev)
 		chip->iobase, chip->irq);
 	strcpy(card->mixername, "CX25821");
 
-	pr_info("%s/%i: ALSA support for cx25821 boards\n",
-		card->driver, devno);
+	pr_info("%s/%i: ALSA support for cx25821 boards\n", card->driver,
+		devno);
 
 	err = snd_card_register(card);
 	if (err < 0) {
-- 
1.7.0.4


  parent reply	other threads:[~2011-10-22  5:46 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 ` Leonid V. Fedorenchik [this message]
2011-10-22  5:43 ` [PATCH 05/36] Staging: cx25821: cx25821-audio-upstream.c: " 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 ` [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-5-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).