lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Staging: cx25821: Fix obscure line endings in cx25821-audio-upstream.c

Browse Source 
Change obscure line endings to less obscure ones. Rationale: more
readable.

Signed-off-by: Leonid V. Fedorenchik <leonidsbox@gmail.com>
Reviewed-By: Valdis Kletnieks <valdis.kletnieks@vt.edu>
Reviewed-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Leonid V. Fedorenchik
2011-09-02 11:55:38 +08:00
committed by Greg Kroah-Hartman
parent cc4600c9f4
commit 1531e889ab
1 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/staging/cx25821/cx25821-audio-upstream.c
View File

@@ -349,10 +349,8 @@ static void cx25821_audioups_handler(struct work_struct *work)
return; return;
} }
cx25821_get_audio_data(dev, cx25821_get_audio_data(dev, dev->channels[dev->_audio_upstream_channel].
dev->channels[dev-> sram_channels);
_audio_upstream_channel].
sram_channels);
} }
int cx25821_openfile_audio(struct cx25821_dev *dev, int cx25821_openfile_audio(struct cx25821_dev *dev,
@@ -555,8 +553,7 @@ int cx25821_audio_upstream_irq(struct cx25821_dev *dev, int chan_num,
} }
} }
/* Jump to 2nd Audio Frame */ /* Jump to 2nd Audio Frame */
*(rp++) = *(rp++) = cpu_to_le32(RISC_JUMP | RISC_IRQ1 |
cpu_to_le32(RISC_JUMP | RISC_IRQ1 |
RISC_CNT_RESET); RISC_CNT_RESET);
*(rp++) = cpu_to_le32(risc_phys_jump_addr); *(rp++) = cpu_to_le32(risc_phys_jump_addr);
*(rp++) = cpu_to_le32(0); *(rp++) = cpu_to_le32(0);
@@ -611,11 +608,8 @@ static irqreturn_t cx25821_upstream_irq_audio(int irq, void *dev_id)
/* Only deal with our interrupt */ /* Only deal with our interrupt */
if (audio_status) { if (audio_status) {
handled = handled = cx25821_audio_upstream_irq(dev,
cx25821_audio_upstream_irq(dev, dev->_audio_upstream_channel, audio_status);
dev->
_audio_upstream_channel,
audio_status);
} }
if (handled < 0) if (handled < 0)
@@ -770,9 +764,8 @@ int cx25821_audio_upstream_init(struct cx25821_dev *dev, int channel_select)
memcpy(dev->_audiofilename, _defaultAudioName, str_length + 1); memcpy(dev->_audiofilename, _defaultAudioName, str_length + 1);
} }
retval = retval = cx25821_sram_channel_setup_upstream_audio(dev, sram_ch,
cx25821_sram_channel_setup_upstream_audio(dev, sram_ch, _line_size, _line_size, 0);
0);
dev->audio_upstream_riscbuf_size = dev->audio_upstream_riscbuf_size =
AUDIO_RISC_DMA_BUF_SIZE * NUM_AUDIO_PROGS + AUDIO_RISC_DMA_BUF_SIZE * NUM_AUDIO_PROGS +
@@ -780,8 +773,8 @@ int cx25821_audio_upstream_init(struct cx25821_dev *dev, int channel_select)
dev->audio_upstream_databuf_size = AUDIO_DATA_BUF_SZ * NUM_AUDIO_PROGS; dev->audio_upstream_databuf_size = AUDIO_DATA_BUF_SZ * NUM_AUDIO_PROGS;
/* Allocating buffers and prepare RISC program */ /* Allocating buffers and prepare RISC program */
retval = retval = cx25821_audio_upstream_buffer_prepare(dev, sram_ch,
cx25821_audio_upstream_buffer_prepare(dev, sram_ch, _line_size); _line_size);
if (retval < 0) { if (retval < 0) {
pr_err("%s: Failed to set up Audio upstream buffers!\n", pr_err("%s: Failed to set up Audio upstream buffers!\n",
dev->name); dev->name);